"
if(islist(gear.restricted_roles))
if(gear.restricted_roles.len)
@@ -929,14 +938,15 @@ GLOBAL_LIST_EMPTY(preferences_datums)
dat += gear.restricted_roles.Join(";")
dat += ""
if(!istype(gear, /datum/gear/unlockable))
- dat += "
[gear.description]
"
+ // the below line essentially means "if the loadout item is picked by the user and has a custom description, give it the custom description, otherwise give it the default description"
+ dat += "
"
else
//we add the user's progress to the description assuming they have progress
var/datum/gear/unlockable/unlockable = gear
var/progress_made = unlockable_loadout_data[unlockable.progress_key]
if(!progress_made)
progress_made = 0
- dat += "
"
dat += ""
if(4) // Content preferences
@@ -2312,6 +2322,28 @@ GLOBAL_LIST_EMPTY(preferences_datums)
features["body_model"] = chosengender
gender = chosengender
+ if("language")
+ choselanguage = input(user, "Select a language.", "Language", language) as null|anything in list("Beachtongue","Draconic","Dwarven",
+ "Chimpanzee","Space Sign Language","Random")
+ if(!choselanguage)
+ return
+ switch(choselanguage)
+ if("Rachidian")
+ language = /datum/language/arachnid
+ if("Beachtongue")
+ language = /datum/language/beachbum
+ if("Draconic")
+ language = /datum/language/draconic
+ if("Dwarven")
+ language = /datum/language/dwarf
+ if("Chimpanzee")
+ language = /datum/language/monkey
+ if("Space Sign Language")
+ language = /datum/language/signlanguage
+ if("Random")
+ language = pick(list("Rachidian", "Beachtongue","Draconic","Dwarven",
+ "Chimpanzee","Space Sign Language"))
+
if("body_size")
var/new_body_size = input(user, "Choose your desired sprite size: (90-125%)\nWarning: This may make your character look distorted. Additionally, any size under 100% takes a 10% maximum health penalty", "Character Preference", features["body_size"]*100) as num|null
if(new_body_size)
@@ -2702,7 +2734,9 @@ GLOBAL_LIST_EMPTY(preferences_datums)
loadout_data["SAVE_[loadout_slot]"] += list(new_loadout_data) //double packed because it does the union of the CONTENTS of the lists
else
loadout_data["SAVE_[loadout_slot]"] = list(new_loadout_data) //double packed because you somehow had no save slot in your loadout?
- if(href_list["loadout_color"])
+
+ if(href_list["loadout_color"] || href_list["loadout_color_polychromic"] || href_list["loadout_rename"] || href_list["loadout_redescribe"])
+ //if the gear doesn't exist, or they don't have it, ignore the request
var/name = html_decode(href_list["loadout_gear_name"])
var/datum/gear/G = GLOB.loadout_items[gear_category][gear_subcategory][name]
if(!G)
@@ -2710,29 +2744,44 @@ GLOBAL_LIST_EMPTY(preferences_datums)
var/user_gear = has_loadout_gear(loadout_slot, "[G.type]")
if(!user_gear)
return
- if(!length(user_gear[LOADOUT_COLOR]))
- user_gear[LOADOUT_COLOR] = list("#FFFFFF")
- var/current_color = user_gear[LOADOUT_COLOR][1]
- var/new_color = input(user, "Polychromic options", "Choose Color", current_color) as color|null
- user_gear[LOADOUT_COLOR][1] = sanitize_hexcolor(new_color, 6, TRUE, current_color)
- if(href_list["loadout_color_polychromic"])
- var/name = html_decode(href_list["loadout_gear_name"])
- var/datum/gear/G = GLOB.loadout_items[gear_category][gear_subcategory][name]
- if(!G)
- return
- var/user_gear = has_loadout_gear(loadout_slot, "[G.type]")
- if(!user_gear)
- return
- var/list/color_options = list()
- for(var/i=1, i<=length(G.loadout_initial_colors), i++)
- color_options += "Color [i]"
- var/color_to_change = input(user, "Polychromic options", "Recolor [name]") as null|anything in color_options
- if(color_to_change)
- var/color_index = text2num(copytext(color_to_change, 7))
- var/current_color = user_gear[LOADOUT_COLOR][color_index]
- var/new_color = input(user, "Polychromic options", "Choose [color_to_change] Color", current_color) as color|null
- if(new_color)
- user_gear[LOADOUT_COLOR][color_index] = sanitize_hexcolor(new_color, 6, TRUE, current_color)
+
+ //possible requests: recolor, recolor (polychromic), rename, redescribe
+ //always make sure the gear allows said request before proceeding
+
+ //non-poly coloring can only be done by non-poly items
+ if(href_list["loadout_color"] && !(G.loadout_flags & LOADOUT_CAN_COLOR_POLYCHROMIC))
+ if(!length(user_gear[LOADOUT_COLOR]))
+ user_gear[LOADOUT_COLOR] = list("#FFFFFF")
+ var/current_color = user_gear[LOADOUT_COLOR][1]
+ var/new_color = input(user, "Polychromic options", "Choose Color", current_color) as color|null
+ user_gear[LOADOUT_COLOR][1] = sanitize_hexcolor(new_color, 6, TRUE, current_color)
+
+ //poly coloring can only be done by poly items
+ if(href_list["loadout_color_polychromic"] && (G.loadout_flags & LOADOUT_CAN_COLOR_POLYCHROMIC))
+ var/list/color_options = list()
+ for(var/i=1, i<=length(G.loadout_initial_colors), i++)
+ color_options += "Color [i]"
+ var/color_to_change = input(user, "Polychromic options", "Recolor [name]") as null|anything in color_options
+ if(color_to_change)
+ var/color_index = text2num(copytext(color_to_change, 7))
+ var/current_color = user_gear[LOADOUT_COLOR][color_index]
+ var/new_color = input(user, "Polychromic options", "Choose [color_to_change] Color", current_color) as color|null
+ if(new_color)
+ user_gear[LOADOUT_COLOR][color_index] = sanitize_hexcolor(new_color, 6, TRUE, current_color)
+
+ //both renaming and redescribing strip the input to stop html injection
+
+ //renaming is only allowed if it has the flag for it
+ if(href_list["loadout_rename"] && (G.loadout_flags & LOADOUT_CAN_NAME))
+ var/new_name = stripped_input(user, "Enter new name for item. Maximum [MAX_NAME_LEN] characters.", "Loadout Item Naming", null, MAX_NAME_LEN)
+ if(new_name)
+ user_gear[LOADOUT_CUSTOM_NAME] = new_name
+
+ //redescribing is only allowed if it has the flag for it
+ if(href_list["loadout_redescribe"] && (G.loadout_flags & LOADOUT_CAN_DESCRIPTION)) //redescribe isnt a real word but i can't think of the right term to use
+ var/new_description = stripped_input(user, "Enter new description for item. Maximum 500 characters.", "Loadout Item Redescribing", null, 500)
+ if(new_description)
+ user_gear[LOADOUT_CUSTOM_DESCRIPTION] = new_description
ShowChoices(user)
return 1
diff --git a/code/modules/client/preferences_savefile.dm b/code/modules/client/preferences_savefile.dm
index 0db9fbb66c..458f607ac9 100644
--- a/code/modules/client/preferences_savefile.dm
+++ b/code/modules/client/preferences_savefile.dm
@@ -271,7 +271,7 @@ SAVEFILE UPDATING/VERSIONING - 'Simplified', or rather, more coder-friendly ~Car
loadout_data["SAVE_[i]"] = list()
for(var/some_gear_item in saved_loadout_paths)
if(!ispath(text2path(some_gear_item)))
- message_admins("Failed to copy item [some_gear_item] to new loadout system when migrating from version [current_version] to 40, issue: item is not a path")
+ log_game("Failed to copy item [some_gear_item] to new loadout system when migrating from version [current_version] to 40, issue: item is not a path")
continue
var/datum/gear/gear_item = text2path(some_gear_item)
if(!(initial(gear_item.loadout_flags) & LOADOUT_CAN_COLOR_POLYCHROMIC))
@@ -604,6 +604,8 @@ SAVEFILE UPDATING/VERSIONING - 'Simplified', or rather, more coder-friendly ~Car
S["body_model"] >> features["body_model"]
S["body_size"] >> features["body_size"]
S["age"] >> age
+ S["language"] >> language
+ S["choselanguage"] >> choselanguage
S["hair_color"] >> hair_color
S["facial_hair_color"] >> facial_hair_color
S["eye_type"] >> eye_type
@@ -656,6 +658,14 @@ SAVEFILE UPDATING/VERSIONING - 'Simplified', or rather, more coder-friendly ~Car
modified_limbs = safe_json_decode(limbmodstr)
else
modified_limbs = list()
+
+ var/tcgcardstr
+ S["tcg_cards"] >> tcgcardstr
+ if(length(tcgcardstr))
+ tcg_cards = safe_json_decode(tcgcardstr)
+ else
+ tcg_cards = list()
+
S["chosen_limb_id"] >> chosen_limb_id
S["hide_ckey"] >> hide_ckey //saved per-character
@@ -947,6 +957,8 @@ SAVEFILE UPDATING/VERSIONING - 'Simplified', or rather, more coder-friendly ~Car
WRITE_FILE(S["body_model"] , features["body_model"])
WRITE_FILE(S["body_size"] , features["body_size"])
WRITE_FILE(S["age"] , age)
+ WRITE_FILE(S["language"] , language)
+ WRITE_FILE(S["choselanguage"] , choselanguage)
WRITE_FILE(S["hair_color"] , hair_color)
WRITE_FILE(S["facial_hair_color"] , facial_hair_color)
WRITE_FILE(S["eye_type"] , eye_type)
@@ -1091,6 +1103,11 @@ SAVEFILE UPDATING/VERSIONING - 'Simplified', or rather, more coder-friendly ~Car
else
S["loadout"] << safe_json_encode(list())
+ if(length(tcg_cards))
+ S["tcg_cards"] << safe_json_encode(tcg_cards)
+ else
+ S["tcg_cards"] << safe_json_encode(list())
+
cit_character_pref_save(S)
return 1
diff --git a/code/modules/clothing/clothing.dm b/code/modules/clothing/clothing.dm
index ea01b0c0ed..018c3d9a3f 100644
--- a/code/modules/clothing/clothing.dm
+++ b/code/modules/clothing/clothing.dm
@@ -31,6 +31,9 @@
// What items can be consumed to repair this clothing (must by an /obj/item/stack)
var/repairable_by = /obj/item/stack/sheet/cloth
+ // has this item been upgraded by an upgrade kit (see: durathread armor kits)
+ var/upgrade_prefix
+
//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()
@@ -120,6 +123,8 @@
update_clothes_damaged_state(CLOTHING_PRISTINE)
obj_integrity = max_integrity
name = initial(name) // remove "tattered" or "shredded" if there's a prefix
+ if(upgrade_prefix)
+ name = upgrade_prefix + " " + initial(name)
body_parts_covered = initial(body_parts_covered)
slot_flags = initial(slot_flags)
damage_by_parts = null
diff --git a/code/modules/clothing/gloves/miscellaneous.dm b/code/modules/clothing/gloves/miscellaneous.dm
index c069649848..4728001699 100644
--- a/code/modules/clothing/gloves/miscellaneous.dm
+++ b/code/modules/clothing/gloves/miscellaneous.dm
@@ -161,6 +161,68 @@
return NO_AUTO_CLICKDELAY_HANDLING | ATTACK_IGNORE_ACTION
+/obj/item/clothing/gloves/fingerless/ablative
+ name = "ablative armwraps"
+ desc = "Armwraps made out of a highly durable, reflective metal. Has the side effect of absorbing shocks."
+ siemens_coefficient = 0
+ icon_state = "ablative_armwraps"
+ item_state = "ablative_armwraps"
+ block_parry_data = /datum/block_parry_data/ablative_armwraps
+ var/wornonce = FALSE
+
+/obj/item/clothing/gloves/fingerless/ablative/proc/get_component_parry_data(datum/source, parrying_method, datum/parrying_item_mob_or_art, list/backup_items, list/override)
+ if(parrying_method && !(parrying_method == UNARMED_PARRY))
+ return
+ override[src] = ITEM_PARRY
+
+/obj/item/clothing/gloves/fingerless/ablative/equipped(mob/user, slot)
+ . = ..()
+ if(current_equipped_slot == SLOT_GLOVES)
+ RegisterSignal(user, COMSIG_LIVING_ACTIVE_PARRY_START, .proc/get_component_parry_data)
+ wornonce = TRUE
+
+/obj/item/clothing/gloves/fingerless/ablative/dropped(mob/user)
+ . = ..()
+ if(wornonce)
+ UnregisterSignal(user, COMSIG_LIVING_ACTIVE_PARRY_START)
+ wornonce = FALSE
+
+/obj/item/clothing/gloves/fingerless/ablative/can_active_parry(mob/user)
+ var/mob/living/carbon/human/H = user
+ if(!istype(H))
+ return FALSE
+ return src == H.gloves
+
+/obj/item/clothing/gloves/fingerless/ablative/on_active_parry(mob/living/owner, atom/object, damage, attack_text, attack_type, armour_penetration, mob/attacker, def_zone, list/block_return, parry_efficiency, parry_time)
+ . = ..()
+ if(parry_efficiency > 0)
+ owner.visible_message("[owner] deflects \the [object] with their armwraps!")
+
+/datum/block_parry_data/ablative_armwraps
+ parry_stamina_cost = 4
+ parry_attack_types = ATTACK_TYPE_UNARMED | ATTACK_TYPE_PROJECTILE | ATTACK_TYPE_TACKLE | ATTACK_TYPE_THROWN | ATTACK_TYPE_MELEE
+ parry_flags = NONE
+
+ parry_time_windup = 0
+ parry_time_spindown = 0
+ parry_time_active = 7.5
+
+ parry_time_perfect = 1
+ parry_time_perfect_leeway = 7.5
+ parry_imperfect_falloff_percent = 20
+ parry_efficiency_perfect = 100
+ parry_time_perfect_leeway_override = list(
+ TEXT_ATTACK_TYPE_MELEE = 1
+ )
+
+ parry_efficiency_considered_successful = 0.01
+ parry_efficiency_to_counterattack = INFINITY // no auto counter
+ parry_max_attacks = INFINITY
+ parry_failed_cooldown_duration = 2.25 SECONDS
+ parry_failed_stagger_duration = 2.25 SECONDS
+ parry_cooldown = 3 SECONDS
+ parry_failed_clickcd_duration = 0.5 SECONDS
+
/obj/item/clothing/gloves/botanic_leather
name = "botanist's leather gloves"
desc = "These leather gloves protect against thorns, barbs, prickles, spikes and other harmful objects of floral origin. They're also quite warm."
diff --git a/code/modules/clothing/masks/gasmask.dm b/code/modules/clothing/masks/gasmask.dm
index 15a5345ad1..525db577e0 100644
--- a/code/modules/clothing/masks/gasmask.dm
+++ b/code/modules/clothing/masks/gasmask.dm
@@ -17,7 +17,7 @@
/obj/item/clothing/mask/gas/examine(mob/user)
. = ..()
if(flavor_adjust)
- . += "Alt-click to toggle identity concealment. it's currently [flags_inv & HIDEFACE ? "on" : "off"]."
+ . += "Alt-click to toggle identity concealment. It's currently [flags_inv & HIDEFACE ? "on" : "off"]."
/obj/item/clothing/mask/gas/AltClick(mob/user)
. = ..()
@@ -143,14 +143,17 @@
"Blanc" = image(icon = src.icon, icon_state = "mime"),
"Excité" = image(icon = src.icon, icon_state = "sexymime"),
"Triste" = image(icon = src.icon, icon_state = "sadmime"),
- "Effrayé" = image(icon = src.icon, icon_state = "scaredmime")
+ "Effrayé" = image(icon = src.icon, icon_state = "scaredmime"),
+ "Timid Woman" = image(icon = src.icon, icon_state = "timidwoman"),
+ "Timid Man" = image(icon = src.icon, icon_state = "timidman")
)
/obj/item/clothing/mask/gas/mime/ui_action_click(mob/user)
if(!istype(user) || user.incapacitated())
return
- var/static/list/options = list("Blanc" = "mime", "Triste" = "sadmime", "Effrayé" = "scaredmime", "Excité" ="sexymime")
+ var/static/list/options = list("Blanc" = "mime", "Triste" = "sadmime", "Effrayé" = "scaredmime", "Excité" ="sexymime",
+ "Timid Woman" = "timidwoman", "Timid Man" = "timidman")
var/choice = show_radial_menu(user,src, mimemask_designs, custom_check = FALSE, radius = 36, require_near = TRUE)
@@ -170,6 +173,20 @@
item_state = "sexymime"
actions_types = list()
+/obj/item/clothing/mask/gas/timidcostume
+ name = "timid woman mask"
+ desc = "Most people who wear these are not really that timid."
+ clothing_flags = ALLOWINTERNALS
+ icon_state = "timidwoman"
+ item_state = "timidwoman"
+ flags_cover = MASKCOVERSEYES
+ resistance_flags = FLAMMABLE
+
+/obj/item/clothing/mask/gas/timidcostume/man
+ name = "timid man mask"
+ icon_state = "timidman"
+ item_state = "timidman"
+
/obj/item/clothing/mask/gas/monkeymask
name = "monkey mask"
desc = "A mask used when acting as a monkey."
diff --git a/code/modules/clothing/masks/miscellaneous.dm b/code/modules/clothing/masks/miscellaneous.dm
index 5dd35788f1..fe08cbd63e 100644
--- a/code/modules/clothing/masks/miscellaneous.dm
+++ b/code/modules/clothing/masks/miscellaneous.dm
@@ -33,6 +33,16 @@
actions_types = list(/datum/action/item_action/adjust)
mutantrace_variation = STYLE_MUZZLE
+/obj/item/clothing/mask/surgical/aesthetic
+ name = "aesthetic sterile mask"
+ desc = "A sterile mask designed to help prevent the spread of diseases. This one doesn't seem like it does a whole lot, somehow."
+ flags_inv = null
+ flags_cover = null
+ visor_flags_inv = null
+ visor_flags_cover = null
+ permeability_coefficient = 1
+ armor = list("melee" = 0, "bullet" = 0, "laser" = 0,"energy" = 0, "bomb" = 0, "bio" = 0, "rad" = 0, "fire" = 0, "acid" = 0)
+
/obj/item/clothing/mask/surgical/attack_self(mob/user)
adjustmask(user)
diff --git a/code/modules/clothing/neck/_neck.dm b/code/modules/clothing/neck/_neck.dm
index 51a526d089..b0af7aa0d5 100644
--- a/code/modules/clothing/neck/_neck.dm
+++ b/code/modules/clothing/neck/_neck.dm
@@ -237,6 +237,12 @@
icon_state = "choker"
poly_colors = list("#222222")
+/obj/item/clothing/neck/necklace/cowbell
+ name = "cowbell collar"
+ desc = "Who would wear this? Take this off, you aren't a cow, you're just an awful degenerate."
+ icon = 'icons/obj/clothing/neck.dmi'
+ icon_state = "cowbell"
+
/obj/item/key/collar
name = "Collar Key"
desc = "A key for a tiny lock on a collar or bag."
@@ -289,7 +295,7 @@
//VERY SUPER BADASS NECKERCHIEFS//
//////////////////////////////////
-obj/item/clothing/neck/neckerchief
+/obj/item/clothing/neck/neckerchief
icon = 'icons/obj/clothing/masks.dmi' //In order to reuse the bandana sprite
w_class = WEIGHT_CLASS_TINY
var/sourceBandanaType
diff --git a/code/modules/clothing/shoes/colour.dm b/code/modules/clothing/shoes/colour.dm
index df0f03f614..9d51753c78 100644
--- a/code/modules/clothing/shoes/colour.dm
+++ b/code/modules/clothing/shoes/colour.dm
@@ -51,6 +51,17 @@
desc = "Very gay shoes."
icon_state = "rain_bow"
+/obj/item/clothing/shoes/sneakers/poly/polychromic
+ name = "polychromic shoes"
+ desc = "Every color."
+ icon_state = "poly"
+ item_state = "poly"
+ var/list/poly_colors = list("#FFFFFF", "#1D1D1D")
+
+/obj/item/clothing/shoes/sneakers/poly/polychromic/ComponentInitialize()
+ . = ..()
+ AddElement(/datum/element/polychromic, poly_colors, 2)
+
/obj/item/clothing/shoes/sneakers/orange
name = "orange shoes"
icon_state = "orange"
diff --git a/code/modules/clothing/shoes/miscellaneous.dm b/code/modules/clothing/shoes/miscellaneous.dm
index b0d760ebd9..cc14424980 100644
--- a/code/modules/clothing/shoes/miscellaneous.dm
+++ b/code/modules/clothing/shoes/miscellaneous.dm
@@ -97,12 +97,14 @@
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!"
+ desc = "The prankster's standard-issue clowning shoes. Damn, they're huge! Ctrl-click to toggle waddle dampeners."
name = "clown shoes"
icon_state = "clown_shoes"
slowdown = SHOES_SLOWDOWN+1
pocket_storage_component_path = /datum/component/storage/concrete/pockets/shoes/clown
lace_time = 20 SECONDS // how the hell do these laces even work??
+ var/datum/component/waddle
+ var/enabled_waddle = TRUE
/obj/item/clothing/shoes/clown_shoes/Initialize()
. = ..()
@@ -110,14 +112,31 @@
/obj/item/clothing/shoes/clown_shoes/equipped(mob/user, slot)
. = ..()
- if(user.mind && HAS_TRAIT(user.mind, TRAIT_CLOWN_MENTALITY))
- SEND_SIGNAL(user, COMSIG_CLEAR_MOOD_EVENT, "noshoes")
+ if(slot == SLOT_SHOES)
+ if(enabled_waddle)
+ waddle = user.AddComponent(/datum/component/waddling)
+ if(user.mind && HAS_TRAIT(user.mind, TRAIT_CLOWN_MENTALITY))
+ SEND_SIGNAL(user, COMSIG_CLEAR_MOOD_EVENT, "noshoes")
/obj/item/clothing/shoes/clown_shoes/dropped(mob/user)
. = ..()
+ QDEL_NULL(waddle)
if(user.mind && HAS_TRAIT(user.mind, TRAIT_CLOWN_MENTALITY))
SEND_SIGNAL(user, COMSIG_ADD_MOOD_EVENT, "noshoes", /datum/mood_event/noshoes)
+/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."
@@ -413,6 +432,22 @@
var/wallcharges = 4
var/newlocobject = null
+/obj/item/clothing/shoes/timidcostume
+ name = "timid woman boots"
+ desc = "Ready to rock your hips back and forth? These boots have a polychromic finish."
+ icon_state = "timidwoman"
+ item_state = "timidwoman"
+
+/obj/item/clothing/shoes/timidcostume/ComponentInitialize()
+ . = ..()
+ AddElement(/datum/element/polychromic, list("#0094FF"), 1)
+
+/obj/item/clothing/shoes/timidcostume/man
+ name = "timid man shoes"
+ desc = "Ready to go kart racing? These shoes have a polychromic finish."
+ icon_state = "timidman"
+ item_state = "timidman"
+
/obj/item/clothing/shoes/wallwalkers/equipped(mob/user,slot)
. = ..()
if(slot == SLOT_SHOES)
diff --git a/code/modules/clothing/suits/cloaks.dm b/code/modules/clothing/suits/cloaks.dm
index 133956e44e..f4fd844e8a 100644
--- a/code/modules/clothing/suits/cloaks.dm
+++ b/code/modules/clothing/suits/cloaks.dm
@@ -102,7 +102,18 @@
/obj/item/clothing/neck/cloak/polychromic/ComponentInitialize()
. = ..()
AddElement(/datum/element/polychromic, poly_colors, 3)
-
+
+/obj/item/clothing/neck/cancloak/polychromic
+ name = "canvas cloak"
+ desc = "A rugged cloak made of canvas."
+ icon_state = "cancloak"
+ item_state = "cancloak"
+ var/list/poly_colors = list("#585858", "#373737", "#BEBEBE")
+
+/obj/item/clothing/neck/cancloak/polychromic/ComponentInitialize()
+ . = ..()
+ AddElement(/datum/element/polychromic, poly_colors, 3)
+
/obj/item/clothing/neck/cloak/alt
name = "cloak"
desc = "A ragged up white cloak. It reminds you of a place not far from here."
diff --git a/code/modules/clothing/suits/miscellaneous.dm b/code/modules/clothing/suits/miscellaneous.dm
index 6dfcd72c10..07741208c3 100644
--- a/code/modules/clothing/suits/miscellaneous.dm
+++ b/code/modules/clothing/suits/miscellaneous.dm
@@ -487,6 +487,17 @@
item_state = "militaryjacket"
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/radio)
+/obj/item/clothing/suit/jacket/urbanjacket/polychromic
+ name = "urban jacket"
+ desc = "A canvas jacket styled with a fur neck piece, stylish."
+ icon_state = "urbanjacket"
+ item_state = "urbanjacket"
+ 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/radio)
+
+/obj/item/clothing/suit/jacket/urbanjacket/polychromic/ComponentInitialize()
+ . = ..()
+ AddElement(/datum/element/polychromic, list("#26321D", "#CBBDAF", "#292929"), 3)
+
/obj/item/clothing/suit/jacket/letterman
name = "letterman jacket"
desc = "A classic brown letterman jacket. Looks pretty hot and heavy."
@@ -1023,6 +1034,16 @@
alternate_worn_layer = UNDER_HEAD_LAYER
mutantrace_variation = STYLE_DIGITIGRADE|STYLE_NO_ANTHRO_ICON
+/obj/item/clothing/suit/toggle/wbreakpoly
+ name = "polychromic windbreaker"
+ desc = "Perfect for windy days."
+ icon_state = "wbreakpoly"
+ item_state = "wbreakpoly"
+
+/obj/item/clothing/suit/toggle/wbreakpoly/polychromic/ComponentInitialize()
+ . = ..()
+ AddElement(/datum/element/polychromic, list("#464F65", "#916035", "#474747"), 3)
+
/obj/item/clothing/suit/flakjack
name = "flak jacket"
desc = "A dilapidated jacket made of a supposedly bullet-proof material (Hint: It isn't.). Smells faintly of napalm."
@@ -1088,6 +1109,36 @@
icon_state = "winterhood_poly"
item_state = "winterhood_poly"
+/obj/item/clothing/suit/hooded/wintercoat/timidcostume
+ name = "timid woman hoodie"
+ desc = "A snug, tight yet warm outfit with belts wrapped around it. Looks to be made of polychromic materials."
+ icon_state = "timidwoman"
+ item_state = "timidwoman"
+ hoodtype = /obj/item/clothing/head/hooded/winterhood/timidcostume
+
+/obj/item/clothing/suit/hooded/wintercoat/timidcostume/ComponentInitialize()
+ . = ..()
+ AddElement(/datum/element/polychromic, list("#EB0C07", "#5E2400", "#CEA100"), 3)
+
+/obj/item/clothing/head/hooded/winterhood/timidcostume
+ name = "timid woman hood"
+ desc = "A hood attached to the hoodie."
+ icon_state = "timidwoman"
+ item_state = "timidwoman"
+
+/obj/item/clothing/suit/hooded/wintercoat/timidcostume/man
+ name = "timid man hoodie"
+ desc = "A snug, tight yet warm outfit a belt wrapped around it. Looks to be made of polychromic materials."
+ icon_state = "timidman"
+ item_state = "timidman"
+ hoodtype = /obj/item/clothing/head/hooded/winterhood/timidcostume/man
+
+/obj/item/clothing/head/hooded/winterhood/timidcostume/man
+ name = "timid man hood"
+ icon_state = "timidman"
+ item_state = "timidman"
+
+
/obj/item/clothing/suit/striped_sweater
name = "striped sweater"
desc = "Reminds you of someone, but you just can't put your finger on it..."
diff --git a/code/modules/clothing/suits/toggles.dm b/code/modules/clothing/suits/toggles.dm
index 16a6c06799..aa22834670 100644
--- a/code/modules/clothing/suits/toggles.dm
+++ b/code/modules/clothing/suits/toggles.dm
@@ -61,8 +61,9 @@
if(!hood)
to_chat(loc, "[src] seems to be missing its hood..")
return
- hood.atom_colours = atom_colours.Copy()
- hood.update_atom_colour()
+ if(atom_colours)
+ hood.atom_colours = atom_colours.Copy()
+ hood.update_atom_colour()
if(!suittoggled)
if(ishuman(src.loc))
var/mob/living/carbon/human/H = src.loc
@@ -198,8 +199,9 @@
if(!helmet)
to_chat(H, "[src] seems to be missing its helmet..")
return
- helmet.atom_colours = atom_colours.Copy()
- helmet.update_atom_colour()
+ if(atom_colours)
+ helmet.atom_colours = atom_colours.Copy()
+ helmet.update_atom_colour()
if(!suittoggled)
if(ishuman(src.loc))
if(H.wear_suit != src)
diff --git a/code/modules/clothing/under/_under.dm b/code/modules/clothing/under/_under.dm
index e617d2d57b..3207a5842f 100644
--- a/code/modules/clothing/under/_under.dm
+++ b/code/modules/clothing/under/_under.dm
@@ -32,6 +32,9 @@
/obj/item/clothing/under/attackby(obj/item/I, mob/user, params)
if((has_sensor == BROKEN_SENSORS) && istype(I, /obj/item/stack/cable_coil))
+ if(damaged_clothes)
+ to_chat(user,"You should repair the damage done to [src] first.")
+ return 0
var/obj/item/stack/cable_coil/C = I
I.use_tool(src, user, 0, 1)
has_sensor = HAS_SENSORS
diff --git a/code/modules/clothing/under/accessories.dm b/code/modules/clothing/under/accessories.dm
index ee7e4c48e1..7f28b88ad6 100644
--- a/code/modules/clothing/under/accessories.dm
+++ b/code/modules/clothing/under/accessories.dm
@@ -79,13 +79,175 @@
if(initial(above_suit))
. += "\The [src] can be worn above or below your suit. Alt-click to toggle."
+//////////////
+//Waistcoats//
+//////////////
+
/obj/item/clothing/accessory/waistcoat
- name = "waistcoat"
+ name = "black waistcoat"
desc = "For some classy, murderous fun."
icon_state = "waistcoat"
item_state = "waistcoat"
minimize_when_attached = FALSE
+/obj/item/clothing/accessory/waistcoat/red
+ name = "red waistcoat"
+ icon_state = "waistcoat_red"
+ item_state = "waistcoat_red"
+
+/obj/item/clothing/accessory/waistcoat/grey
+ name = "grey waistcoat"
+ icon_state = "waistcoat_grey"
+ item_state = "waistcoat_grey"
+
+/obj/item/clothing/accessory/waistcoat/brown
+ name = "red waistcoat"
+ icon_state = "waistcoat_brown"
+ item_state = "waistcoat_brown"
+
+/obj/item/clothing/accessory/waistcoat/sweatervest
+ name = "black sweatervest"
+ icon_state = "sweatervest"
+ item_state = "sweatervest"
+
+/obj/item/clothing/accessory/waistcoat/sweatervest/blue
+ name = "blue sweatervest"
+ icon_state = "sweatervest_blue"
+ item_state = "sweatervest_blue"
+
+/obj/item/clothing/accessory/waistcoat/sweatervest/red
+ name = "red sweatervest"
+ icon_state = "sweatervest_red"
+ item_state = "sweatervest_red"
+
+////////////
+//Sweaters//
+////////////
+
+/obj/item/clothing/accessory/sweater
+ name = "grey sweater"
+ desc = "Nicely comfy and warm!"
+ icon_state = "sweater"
+ item_state = "sweater"
+ minimize_when_attached = FALSE
+
+/obj/item/clothing/accessory/sweater/pink
+ name = "pink sweater"
+ icon_state = "sweater_pink"
+ item_state = "sweater_pink"
+
+/obj/item/clothing/accessory/sweater/heart
+ name = "heart sweater"
+ icon_state = "sweater_heart"
+ item_state = "sweater_heart"
+
+/obj/item/clothing/accessory/sweater/blue
+ name = "blue sweater"
+ icon_state = "sweater_blue"
+ item_state = "sweater_blue"
+
+/obj/item/clothing/accessory/sweater/nt
+ name = "nanotrasen sweater"
+ icon_state = "sweater_nt"
+ item_state = "sweater_nt"
+
+/obj/item/clothing/accessory/sweater/mint
+ name = "mint sweater"
+ icon_state = "sweater_mint"
+ item_state = "sweater_mint"
+
+/obj/item/clothing/accessory/sweater/shoulderless
+ name = "shoulderless sweater"
+ icon_state = "sweater_shoulderless"
+ item_state = "sweater_shoulderless"
+
+/obj/item/clothing/accessory/sweater/uglyxmas
+ name = "ugly xmas sweater"
+ icon_state = "sweater_uglyxmas"
+ item_state = "sweater_uglyxmas"
+
+/obj/item/clothing/accessory/sweater/flower
+ name = "flower sweater"
+ icon_state = "sweater_flower"
+ item_state = "sweater_flower"
+
+////////////////
+//Suit Jackets//
+////////////////
+
+/obj/item/clothing/accessory/suitjacket
+ name = "tan suit jacket"
+ desc = "For those times when you have to attend a fancy business meeting without wearing your pants."
+ icon_state = "jacket_tan"
+ item_state = "jacket_tan"
+ minimize_when_attached = FALSE
+
+/obj/item/clothing/accessory/suitjacket/charcoal
+ name = "charcoal suit jacket"
+ icon_state = "jacket_charcoal"
+ item_state = "jacket_charcoal"
+
+/obj/item/clothing/accessory/suitjacket/navy
+ name = "navy suit jacket"
+ icon_state = "jacket_navy"
+ item_state = "jacket_navy"
+
+/obj/item/clothing/accessory/suitjacket/burgundy
+ name = "burgundy suit jacket"
+ icon_state = "jacket_burgundy"
+ item_state = "jacket_burgundy"
+
+/obj/item/clothing/accessory/suitjacket/checkered
+ name = "checkered suit jacket"
+ icon_state = "jacket_checkered"
+ item_state = "jacket_checkered"
+
+///////////////////////
+//Tactical Turtlnecks//
+///////////////////////
+
+/obj/item/clothing/accessory/turtleneck
+ name = "black turtleneck"
+ desc = "Extra cool. Extra fool."
+ icon_state = "turtleneck"
+ item_state = "turtleneck"
+ minimize_when_attached = FALSE
+
+/obj/item/clothing/accessory/turtleneck/red
+ name = "red turtleneck"
+ icon_state = "turtleneck_red"
+ item_state = "turtleneck_red"
+
+/obj/item/clothing/accessory/turtleneck/comfy
+ name = "comfy turtleneck"
+ icon_state = "turtleneck_comfy"
+ item_state = "turtleneck_comfy"
+
+/obj/item/clothing/accessory/turtleneck/tactifool
+ name = "black sweaterneck"
+ desc = "Extra fool. Extra cool."
+ icon_state = "tactifool"
+ item_state = "tactifool"
+
+/obj/item/clothing/accessory/turtleneck/tactifool/green
+ name = "green sweaterneck"
+ icon_state = "tactifool_green"
+ item_state = "tactifool_green"
+
+/obj/item/clothing/accessory/turtleneck/tactifool/blue
+ name = "blue sweaterneck"
+ icon_state = "tactifool_blue"
+ item_state = "tactifool_blue"
+
+/obj/item/clothing/accessory/turtleneck/tactifool/syndicate
+ name = "tactifool sweaterneck"
+ icon_state = "tactifool_syndicate"
+ item_state = "tactifool_syndicate"
+
+/////////////////
+//Miscellaneous//
+/////////////////
+
/obj/item/clothing/accessory/maidapron
name = "maid apron"
desc = "The best part of a maid costume."
diff --git a/code/modules/clothing/under/pants.dm b/code/modules/clothing/under/pants.dm
index c93cefeae9..a76bf41e62 100644
--- a/code/modules/clothing/under/pants.dm
+++ b/code/modules/clothing/under/pants.dm
@@ -46,6 +46,17 @@
desc = "Some tan pants. You look like a white collar worker with these on."
icon_state = "tanpants"
+/obj/item/clothing/under/pants/polypants/polychromic
+ name = "polychromic pants"
+ desc = "Some stylish pair of pants made from polychrome."
+ icon_state = "polypants"
+ item_state = "polypants"
+ var/list/poly_colors = list("#75634F", "#3D3D3D", "#575757")
+
+/obj/item/clothing/under/pants/polypants/polychromic/ComponentInitialize()
+ . = ..()
+ AddElement(/datum/element/polychromic, poly_colors, 3)
+
/obj/item/clothing/under/pants/track
name = "track pants"
desc = "A pair of track pants, for the athletic."
diff --git a/code/modules/clothing/under/suits.dm b/code/modules/clothing/under/suits.dm
index 87e6e94b6b..b9f55e695a 100644
--- a/code/modules/clothing/under/suits.dm
+++ b/code/modules/clothing/under/suits.dm
@@ -91,6 +91,12 @@
icon_state = "tan_suit"
item_state = "tan_suit"
+/obj/item/clothing/under/suit/charismatic_suit
+ name = "charismatic suit"
+ desc = "Luck is for losers, baby."
+ icon_state = "charismatic_suit"
+ item_state = "charismatic_suit"
+
/obj/item/clothing/under/suit/white
name = "white suit"
desc = "A white suit and jacket with a blue shirt. You wanna play rough? OKAY!"
diff --git a/code/modules/events/immovable_rod.dm b/code/modules/events/immovable_rod.dm
index 06318df4f5..90ebe7f6a1 100644
--- a/code/modules/events/immovable_rod.dm
+++ b/code/modules/events/immovable_rod.dm
@@ -144,22 +144,23 @@ In my current plan for it, 'solid' will be defined as anything with density == 1
if(L && (L.density || prob(10)))
L.ex_act(EXPLODE_HEAVY)
-obj/effect/immovablerod/on_attack_hand(mob/living/user, act_intent = user.a_intent, unarmed_attack_flags)
- if(ishuman(user))
- var/mob/living/carbon/human/U = user
- if(U.job in list("Research Director"))
- playsound(src, 'sound/effects/meteorimpact.ogg', 100, 1)
- for(var/mob/M in urange(8, src))
- if(!M.stat)
- shake_camera(M, 2, 3)
- if(wizard)
- U.visible_message("[src] transforms into [wizard] as [U] suplexes them!", "As you grab [src], it suddenly turns into [wizard] as you suplex them!")
- to_chat(wizard, "You're suddenly jolted out of rod-form as [U] somehow manages to grab you, slamming you into the ground!")
- wizard.Stun(60)
- wizard.apply_damage(25, BRUTE)
- qdel(src)
- else
- U.visible_message("[U] suplexes [src] into the ground!", "You suplex [src] into the ground!")
- new /obj/structure/festivus/anchored(drop_location())
- new /obj/effect/anomaly/flux(drop_location())
- qdel(src)
+/obj/effect/immovablerod/on_attack_hand(mob/living/user, act_intent = user.a_intent, unarmed_attack_flags)
+ if(!ishuman(user))
+ return
+ var/mob/living/carbon/human/U = user
+ if(U.job in list("Research Director"))
+ playsound(src, 'sound/effects/meteorimpact.ogg', 100, TRUE)
+ for(var/mob/M in urange(8, src))
+ if(!M.stat)
+ shake_camera(M, 2, 3)
+ if(wizard)
+ U.visible_message("[src] transforms into [wizard] as [U] suplexes them!", "As you grab [src], it suddenly turns into [wizard] as you suplex them!")
+ to_chat(wizard, "You're suddenly jolted out of rod-form as [U] somehow manages to grab you, slamming you into the ground!")
+ wizard.Stun(60)
+ wizard.apply_damage(25, BRUTE)
+ qdel(src)
+ else
+ U.visible_message("[U] suplexes [src] into the ground!", "You suplex [src] into the ground!")
+ new /obj/structure/festivus/anchored(drop_location())
+ new /obj/effect/anomaly/flux(drop_location())
+ qdel(src)
diff --git a/code/modules/events/travelling_trader.dm b/code/modules/events/travelling_trader.dm
index 1f9c69a9f0..2f7b9dbea5 100644
--- a/code/modules/events/travelling_trader.dm
+++ b/code/modules/events/travelling_trader.dm
@@ -25,14 +25,14 @@
var/datum/effect_system/smoke_spread/smoke = new
smoke.set_up(1, spawn_location)
smoke.start()
- trader.visible_message("[src] suddenly appears in a puff of smoke!")
+ trader.visible_message("[trader] suddenly appears in a puff of smoke!")
/datum/round_event/travelling_trader/announce(fake)
priority_announce("A mysterious figure has been detected on sensors at [get_area(spawn_location)]", "Mysterious Figure")
/datum/round_event/travelling_trader/end()
- if(trader)
- trader.visible_message("The [src] has given up on waiting!")
+ if(trader) // the /datum/round_event/travelling_trader has given up on waiting!
+ trader.visible_message("The [trader] has given up on waiting!")
qdel(trader)
//the actual trader mob
@@ -188,18 +188,18 @@
/mob/living/simple_animal/hostile/netherworld/blankbody = 1,
/mob/living/simple_animal/hostile/retaliate/goose = 1)
-mob/living/carbon/human/dummy/travelling_trader/animal_hunter/Initialize()
+/mob/living/carbon/human/dummy/travelling_trader/animal_hunter/Initialize()
+ . = ..()
acceptance_speech = pick(list("This lifeform shall make for a great stew, thank you.", "This lifeform shall be of a true use to our cause, thank you.", "The lifeform is adequate. Goodbye.", "This lifeform shall make a great addition to my collection."))
- ..()
-/mob/living/carbon/human/dummy/travelling_trader/animal_hunter/check_item(var/obj/item/supplied_item) //item is likely to be in contents of whats supplied
+/mob/living/carbon/human/dummy/travelling_trader/animal_hunter/check_item(obj/item/supplied_item) //item is likely to be in contents of whats supplied
for(var/atom/something in supplied_item.contents)
if(istype(something, requested_item))
qdel(something) //typically things holding mobs release the mob when the container is deleted, so delete the mob first here
return TRUE
return FALSE
-/mob/living/carbon/human/dummy/travelling_trader/animal_hunter/give_reward(var/mob/giver) //the reward is actually given in a jar, because releasing it onto the station might be a bad idea
+/mob/living/carbon/human/dummy/travelling_trader/animal_hunter/give_reward(mob/giver) //the reward is actually given in a jar, because releasing it onto the station might be a bad idea
var/obj/item/pet_carrier/bluespace/jar = new(get_turf(src))
var/chosen_animal = pickweight(possible_rewards)
var/mob/living/new_animal = new chosen_animal(jar)
@@ -223,6 +223,7 @@ mob/living/carbon/human/dummy/travelling_trader/animal_hunter/Initialize()
/obj/structure/reagent_dispensers/keg/quintuple_sec = 3)
/mob/living/carbon/human/dummy/travelling_trader/bartender/Initialize() //pick a subtype of ethanol that isn't found in the default set of the booze dispensers reagents
+ . = ..() // RETURN A HINT.
requested_item = pick(subtypesof(/datum/reagent/consumable/ethanol) - list(/datum/reagent/consumable/ethanol/beer,
/datum/reagent/consumable/ethanol/kahlua,
/datum/reagent/consumable/ethanol/whiskey,
@@ -242,7 +243,6 @@ mob/living/carbon/human/dummy/travelling_trader/animal_hunter/Initialize()
/datum/reagent/consumable/ethanol/triple_sec,
/datum/reagent/consumable/ethanol/sake,
/datum/reagent/consumable/ethanol/applejack))
- ..()
/mob/living/carbon/human/dummy/travelling_trader/bartender/check_item(var/obj/item/supplied_item) //you need to check its reagents
if(istype(supplied_item, /obj/item/reagent_containers))
diff --git a/code/modules/food_and_drinks/drinks/drinks.dm b/code/modules/food_and_drinks/drinks/drinks.dm
index 07039139bf..807251111a 100644
--- a/code/modules/food_and_drinks/drinks/drinks.dm
+++ b/code/modules/food_and_drinks/drinks/drinks.dm
@@ -17,10 +17,7 @@
var/isGlass = TRUE //Whether the 'bottle' is made of glass or not so that milk cartons dont shatter when someone gets hit by it
/obj/item/reagent_containers/food/drinks/on_reagent_change(changetype)
- if (gulp_size < 5)
- gulp_size = 5
- else
- gulp_size = max(round(reagents.total_volume / 5), 5)
+ gulp_size = max(round(reagents.total_volume / 5), 5)
/obj/item/reagent_containers/food/drinks/attack(mob/living/M, mob/user, def_zone)
if(!reagents || !reagents.total_volume)
diff --git a/code/modules/food_and_drinks/drinks/drinks/drinkingglass.dm b/code/modules/food_and_drinks/drinks/drinks/drinkingglass.dm
index 8e5069925f..9602c1d24e 100644
--- a/code/modules/food_and_drinks/drinks/drinks/drinkingglass.dm
+++ b/code/modules/food_and_drinks/drinks/drinks/drinkingglass.dm
@@ -52,10 +52,7 @@
/obj/item/reagent_containers/food/drinks/drinkingglass/shotglass/on_reagent_change(changetype)
cut_overlays()
- if (gulp_size < 15)
- gulp_size = 15
- else
- gulp_size = max(round(reagents.total_volume / 15), 15)
+ gulp_size = max(round(reagents.total_volume / 15), 15)
if (reagents.reagent_list.len > 0)
var/datum/reagent/largest_reagent = reagents.get_master_reagent()
diff --git a/code/modules/food_and_drinks/food/snacks_cake.dm b/code/modules/food_and_drinks/food/snacks_cake.dm
index be07826a7f..67ac2ee59b 100644
--- a/code/modules/food_and_drinks/food/snacks_cake.dm
+++ b/code/modules/food_and_drinks/food/snacks_cake.dm
@@ -308,7 +308,7 @@
tastes = list("cake" = 5, "sweetness" = 1, "clouds" = 1)
foodtype = GRAIN | DAIRY | SUGAR
-obj/item/reagent_containers/food/snacks/store/cake/pound_cake
+/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"
diff --git a/code/modules/food_and_drinks/food/snacks_pie.dm b/code/modules/food_and_drinks/food/snacks_pie.dm
index a4287d3d19..5329829637 100644
--- a/code/modules/food_and_drinks/food/snacks_pie.dm
+++ b/code/modules/food_and_drinks/food/snacks_pie.dm
@@ -54,7 +54,7 @@
H.visible_message("[H] is creamed by [src]!", "You've been creamed by [src]!")
playsound(H, "desceration", 50, TRUE)
if(!H.is_mouth_covered())
- reagents.trans_to(H, 15, log = TRUE) //Cream pie combat
+ reagents.trans_to(H, 15, log = "creampie hit") //Cream pie combat
if(!H.creamed) // one layer at a time
H.add_overlay(creamoverlay)
H.creamed = TRUE
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 fecc9467a1..ebde504ec0 100644
--- a/code/modules/food_and_drinks/kitchen_machinery/deep_fryer.dm
+++ b/code/modules/food_and_drinks/kitchen_machinery/deep_fryer.dm
@@ -79,7 +79,7 @@ God bless America.
to_chat(user, "There's nothing to dissolve [I] in!")
return
user.visible_message("[user] drops [I] into [src].", "You dissolve [I] in [src].")
- I.reagents.trans_to(src, I.reagents.total_volume)
+ I.reagents.trans_to(src, I.reagents.total_volume, log = "pill into deep fryer")
qdel(I)
return
if(istype(I,/obj/item/clothing/head/mob_holder))
diff --git a/code/modules/food_and_drinks/kitchen_machinery/microwave.dm b/code/modules/food_and_drinks/kitchen_machinery/microwave.dm
index 6bdf3cff8e..5954788d5c 100644
--- a/code/modules/food_and_drinks/kitchen_machinery/microwave.dm
+++ b/code/modules/food_and_drinks/kitchen_machinery/microwave.dm
@@ -151,10 +151,13 @@
to_chat(user, "You need more space cleaner!")
return TRUE
- if(istype(O, /obj/item/soap))
- var/obj/item/soap/P = O
+ if(istype(O, /obj/item/soap) || istype(O, /obj/item/reagent_containers/rag))
+ var/cleanspeed = 50
+ if(istype(O, /obj/item/soap))
+ var/obj/item/soap/used_soap = O
+ cleanspeed = used_soap.cleanspeed
user.visible_message("[user] starts to clean \the [src].", "You start to clean \the [src]...")
- if(do_after(user, P.cleanspeed, target = src))
+ if(do_after(user, cleanspeed, target = src))
user.visible_message("[user] has cleaned \the [src].", "You clean \the [src].")
dirty = 0
update_icon()
diff --git a/code/modules/food_and_drinks/recipes/tablecraft/recipes_donut.dm b/code/modules/food_and_drinks/recipes/tablecraft/recipes_donut.dm
index c376ab4025..3d3b1ac0fd 100644
--- a/code/modules/food_and_drinks/recipes/tablecraft/recipes_donut.dm
+++ b/code/modules/food_and_drinks/recipes/tablecraft/recipes_donut.dm
@@ -21,7 +21,7 @@
)
result = /obj/item/reagent_containers/food/snacks/donut/chaos
-datum/crafting_recipe/food/donut/meat
+/datum/crafting_recipe/food/donut/meat
time = 15
name = "Meat donut"
reqs = list(
diff --git a/code/modules/holodeck/computer.dm b/code/modules/holodeck/computer.dm
index e5cd36cad6..e94cc17041 100644
--- a/code/modules/holodeck/computer.dm
+++ b/code/modules/holodeck/computer.dm
@@ -115,13 +115,20 @@
return FALSE
var/valid = FALSE
var/list/checked = program_cache.Copy()
- if(obj_flags & EMAGGED)
- checked |= emag_programs
for(var/prog in checked)
var/list/P = prog
if(P["type"] == program_to_load)
valid = TRUE
break
+ if(obj_flags & EMAGGED) //split up into separate for loops instead of together so we can adminlog it
+ checked = emag_programs.Copy()
+ for(var/prog in checked)
+ var/list/P = prog
+ if(P["type"] == program_to_load)
+ valid = TRUE
+ log_game("[key_name(usr)] has loaded the restricted holodeck program [program_to_load]")
+ message_admins("[ADMIN_LOOKUPFLW(usr)] has loaded the restricted holodeck program [program_to_load]")
+ break
if(!valid)
return FALSE
@@ -134,6 +141,14 @@
nerf(obj_flags & EMAGGED)
obj_flags ^= EMAGGED
say("Safeties restored. Restarting...")
+ if(obj_flags & EMAGGED)
+ to_chat(usr,"You vastly increase projector power and override the safety and security protocols.")
+ log_game("[key_name(usr)] has disabled safeties on the holodeck computer")
+ message_admins("[ADMIN_LOOKUPFLW(usr)] has disabled safeties on the holodeck computer")
+ else
+ to_chat(usr,"You restore the safeties to the holodeck.")
+ log_game("[key_name(usr)] has reenabled safeties on the holodeck computer")
+ message_admins("[ADMIN_LOOKUPFLW(usr)] has reenabled safeties on the holodeck computer")
/obj/machinery/computer/holodeck/process()
if(damaged && prob(10))
@@ -179,6 +194,7 @@
to_chat(user, "You vastly increase projector power and override the safety and security protocols.")
say("Warning. Automatic shutoff and derezzing protocols have been corrupted. Please call Nanotrasen maintenance and do not use the simulator.")
log_game("[key_name(user)] emagged the Holodeck Control Console")
+ message_admins("[ADMIN_LOOKUPFLW(user)] emagged the Holodeck Control Console.")
nerf(!(obj_flags & EMAGGED))
/obj/machinery/computer/holodeck/emp_act(severity)
diff --git a/code/modules/hydroponics/grown/cotton.dm b/code/modules/hydroponics/grown/cotton.dm
index beff751479..daaf71c626 100644
--- a/code/modules/hydroponics/grown/cotton.dm
+++ b/code/modules/hydroponics/grown/cotton.dm
@@ -34,16 +34,14 @@
/obj/item/grown/cotton/attack_self(mob/user)
user.show_message("You pull some [cotton_name] out of the [name]!", MSG_VISUAL)
- var/seed_modifier = 0
- if(seed)
- seed_modifier = round(seed.potency / 25)
- var/obj/item/stack/cotton = new cotton_type(user.loc, 1 + seed_modifier)
- var/old_cotton_amount = cotton.amount
- for(var/obj/item/stack/ST in user.loc)
- if(ST != cotton && istype(ST, cotton_type) && ST.amount < ST.max_amount)
- ST.attackby(cotton, user)
- if(cotton.amount > old_cotton_amount)
- to_chat(user, "You add the newly-formed [cotton_name] to the stack. It now contains [cotton.amount] [cotton_name].")
+ var/cottonAmt = 1 + round(seed.potency / 25) // cotton inhand we're holding
+ for(var/obj/item/grown/cotton/ctn in user.loc) // cotton on the floor
+ if(ctn.type != type)
+ continue
+ cottonAmt += 1 + round(ctn.seed.potency / 25)
+ qdel(ctn)
+ new cotton_type(user.drop_location(), cottonAmt)
+ // above code stolen from grass
qdel(src)
//reinforced mutated variant
diff --git a/code/modules/hydroponics/hydroponics.dm b/code/modules/hydroponics/hydroponics.dm
index 8467d00124..e186364cff 100644
--- a/code/modules/hydroponics/hydroponics.dm
+++ b/code/modules/hydroponics/hydroponics.dm
@@ -92,6 +92,11 @@
return BULLET_ACT_HIT
else if(istype(Proj , /obj/item/projectile/energy/florayield))
return myseed.bullet_act(Proj)
+ else if(istype(Proj , /obj/item/projectile/energy/florarevolution))
+ if(myseed)
+ if(myseed.mutatelist.len > 0)
+ myseed.instability = (myseed.instability/2)
+ mutatespecie()
else
return ..()
@@ -384,7 +389,6 @@
/obj/machinery/hydroponics/proc/hardmutate()
mutate(4, 10, 2, 4, 50, 4, 10, 3)
-
/obj/machinery/hydroponics/proc/mutatespecie() // Mutagent produced a new plant!
if(!myseed || dead)
return
@@ -523,12 +527,13 @@
else if(istype(O, /obj/item/seeds) && !istype(O, /obj/item/seeds/sample))
if(!myseed)
if(istype(O, /obj/item/seeds/kudzu))
- investigate_log("had Kudzu planted in it by [key_name(user)] at [AREACOORD(src)]","kudzu")
+ investigate_log("had Kudzu planted in it by [key_name(user)] at [AREACOORD(src)]", INVESTIGATE_BOTANY)
if(!user.transferItemToLoc(O, src))
return
to_chat(user, "You plant [O].")
dead = FALSE
myseed = O
+ investigate_log("planting: [user] planted [O] with traits [english_list(myseed)] and reagents [english_list_assoc(myseed.reagents_add)] and potency [myseed.potency]", INVESTIGATE_BOTANY)
TRAY_NAME_UPDATE
age = 1
plant_health = myseed.endurance
@@ -600,7 +605,34 @@
desc = initial(desc)
weedlevel = 0 //Has a side effect of cleaning up those nasty weeds
update_icon()
-
+ else if(istype(O, /obj/item/gun/energy/floragun))
+ var/obj/item/gun/energy/floragun/flowergun = O
+ if(flowergun.cell.charge < flowergun.cell.maxcharge)
+ to_chat(user, "[flowergun] must be fully charged to lock in a mutation!")
+ return
+ if(!myseed)
+ to_chat(user, "[src] is empty!")
+ return
+ if(myseed.endurance <= 20)
+ to_chat(user, "[myseed.plantname] isn't hardy enough to sequence its mutation!")
+ return
+ if(!myseed.mutatelist)
+ to_chat(user, "[myseed.plantname] has nothing else to mutate into!")
+ return
+ else
+ var/list/fresh_mut_list = list()
+ for(var/muties in myseed.mutatelist)
+ var/obj/item/seeds/another_mut = new muties
+ fresh_mut_list[another_mut.plantname] = muties
+ var/locked_mutation = (input(user, "Select a mutation to lock.", "Plant Mutation Locks") as null|anything in sortList(fresh_mut_list))
+ if(!user.canUseTopic(src, BE_CLOSE) || !locked_mutation)
+ return
+ myseed.mutatelist = list(fresh_mut_list[locked_mutation])
+ myseed.endurance = (myseed.endurance/2)
+ flowergun.cell.use(flowergun.cell.charge)
+ flowergun.update_icon()
+ to_chat(user, "[myseed.plantname]'s mutation was set to [locked_mutation], depleting [flowergun]'s cell!")
+ return
else
return ..()
diff --git a/code/modules/hydroponics/seeds.dm b/code/modules/hydroponics/seeds.dm
index 2dc80cd8fc..577635cd1c 100644
--- a/code/modules/hydroponics/seeds.dm
+++ b/code/modules/hydroponics/seeds.dm
@@ -24,7 +24,7 @@
var/yield = 3 // Amount of growns created per harvest. If is -1, the plant/shroom/weed is never meant to be harvested.
var/potency = 10 // The 'power' of a plant. Generally effects the amount of reagent in a plant, also used in other ways.
var/growthstages = 6 // Amount of growth sprites the plant has.
- var/instability = 5 //Chance that a plant will mutate in each stage of it's life.
+ var/instability = 5 //Chance that a plant will mutate in each stage of it's life.
var/rarity = 0 // How rare the plant is. Used for giving points to cargo when shipping off to CentCom.
var/list/mutatelist = list() // The type of plants that this plant can mutate into.
var/list/genes = list() // Plant genes are stored here, see plant_genes.dm for more info.
@@ -105,7 +105,7 @@
S.reagents_add = reagents_add.Copy() // Faster than grabbing the list from genes.
return S
-obj/item/seeds/proc/is_gene_forbidden(typepath)
+/obj/item/seeds/proc/is_gene_forbidden(typepath)
return (typepath in forbiddengenes)
@@ -188,6 +188,8 @@ obj/item/seeds/proc/is_gene_forbidden(typepath)
///The Number of products produced by the plant, typically the yield.
var/product_count = getYield()
+ parent.investigate_log("manual harvest by [key_name(user)] of [getYield()] of [src], with seed traits [english_list(genes)] and reagents_add [english_list_assoc(reagents_add)] and potency [potency].", INVESTIGATE_BOTANY)
+
while(t_amount < product_count)
var/obj/item/reagent_containers/food/snacks/grown/t_prod
if(instability >= 30 && (seed_flags & MUTATE_EARLY) && LAZYLEN(mutatelist) && prob(instability/3))
diff --git a/code/modules/integrated_electronics/core/integrated_circuit.dm b/code/modules/integrated_electronics/core/integrated_circuit.dm
index f90b584d76..92d2aa270f 100644
--- a/code/modules/integrated_electronics/core/integrated_circuit.dm
+++ b/code/modules/integrated_electronics/core/integrated_circuit.dm
@@ -378,7 +378,7 @@ a creative player the means to solve many problems. Circuits are held inside an
// Checks if the target object is reachable. Useful for various manipulators and manipulator-like objects.
-/obj/item/integrated_circuit/proc/check_target(atom/target, exclude_contents = FALSE, exclude_components = FALSE, exclude_self = FALSE)
+/obj/item/integrated_circuit/proc/check_target(atom/target, exclude_contents = FALSE, exclude_components = FALSE, exclude_self = FALSE, exclude_outside = FALSE)
if(!target)
return FALSE
@@ -394,7 +394,7 @@ a creative player the means to solve many problems. Circuits are held inside an
if(target == assembly.battery)
return FALSE
- if(target.Adjacent(acting_object) && isturf(target.loc))
+ if(!exclude_outside && target.Adjacent(acting_object) && isturf(target.loc))
return TRUE
if(!exclude_contents && (target in acting_object.GetAllContents()))
diff --git a/code/modules/integrated_electronics/subtypes/atmospherics.dm b/code/modules/integrated_electronics/subtypes/atmospherics.dm
index 26ac3080de..d449775bd1 100644
--- a/code/modules/integrated_electronics/subtypes/atmospherics.dm
+++ b/code/modules/integrated_electronics/subtypes/atmospherics.dm
@@ -292,7 +292,7 @@
activate_pin(2)
// Required for making the connector port script work
-obj/item/integrated_circuit/atmospherics/connector/portableConnectorReturnAir()
+/obj/item/integrated_circuit/atmospherics/connector/portableConnectorReturnAir()
return air_contents
diff --git a/code/modules/integrated_electronics/subtypes/manipulation.dm b/code/modules/integrated_electronics/subtypes/manipulation.dm
index eac16d2950..e32f8daa2d 100644
--- a/code/modules/integrated_electronics/subtypes/manipulation.dm
+++ b/code/modules/integrated_electronics/subtypes/manipulation.dm
@@ -186,6 +186,8 @@
AM.forceMove(src)
/obj/item/integrated_circuit/manipulation/grabber/proc/drop(obj/item/AM, turf/T = drop_location())
+ if(!check_target(AM, FALSE, TRUE, TRUE, TRUE))
+ return
var/atom/A = get_object()
A.investigate_log("dropped ([AM]) from [src].", INVESTIGATE_CIRCUIT)
AM.forceMove(T)
diff --git a/code/modules/integrated_electronics/subtypes/weaponized.dm b/code/modules/integrated_electronics/subtypes/weaponized.dm
index 96a732d08f..25fa7058fb 100644
--- a/code/modules/integrated_electronics/subtypes/weaponized.dm
+++ b/code/modules/integrated_electronics/subtypes/weaponized.dm
@@ -137,6 +137,10 @@
//Shooting Code:
A.preparePixelProjectile(target, src)
A.fire()
+ if(ismob(loc.loc))
+ installed_gun.shoot_live_shot(loc.loc)
+ else
+ installed_gun.shoot_live_shot() //Shitcode, but we don't have much of a choice
log_attack("[assembly] [REF(assembly)] has fired [installed_gun].")
return A
diff --git a/code/modules/keybindings/keybind/carbon.dm b/code/modules/keybindings/keybind/carbon.dm
index 46cb5cd0ac..50ec29ff5e 100644
--- a/code/modules/keybindings/keybind/carbon.dm
+++ b/code/modules/keybindings/keybind/carbon.dm
@@ -60,3 +60,14 @@
/datum/keybinding/carbon/select_harm_intent/down(client/user)
user.mob?.a_intent_change(INTENT_HARM)
return TRUE
+
+/datum/keybinding/carbon/give
+ hotkey_keys = list("CtrlG")
+ name = "Give_Item"
+ full_name = "Give item"
+ description = "Give the item you're currently holding"
+
+/datum/keybinding/carbon/give/down(client/user)
+ var/mob/living/carbon/C = user.mob
+ C.give()
+ return TRUE
diff --git a/code/modules/language/signlanguage.dm b/code/modules/language/signlanguage.dm
new file mode 100644
index 0000000000..97705d4a4c
--- /dev/null
+++ b/code/modules/language/signlanguage.dm
@@ -0,0 +1,12 @@
+/datum/language/signlanguage
+ name = "Space Sign Language"
+ desc = "Those who cannot speak can learn this instead."
+ speech_verb = "signs"
+ whisper_verb = "gestures"
+ key = "9"
+ flags = TONGUELESS_SPEECH
+
+ syllables = list(".")
+
+ icon_state = "ssl"
+ default_priority = 90
diff --git a/code/modules/mining/lavaland/necropolis_chests.dm b/code/modules/mining/lavaland/necropolis_chests.dm
index 9c39601b4e..6af1c2118c 100644
--- a/code/modules/mining/lavaland/necropolis_chests.dm
+++ b/code/modules/mining/lavaland/necropolis_chests.dm
@@ -522,7 +522,7 @@
max_charges = 1
item_flags = NEEDS_PERMIT | NOBLUDGEON
w_class = WEIGHT_CLASS_BULKY
- force = 18
+ force = 15
/obj/item/ammo_casing/magic/hook
name = "hook"
@@ -536,11 +536,11 @@
icon_state = "hook"
icon = 'icons/obj/lavaland/artefacts.dmi'
pass_flags = PASSTABLE
- damage = 25
- armour_penetration = 100
+ damage = 15
+ armour_penetration = 10
+ knockdown = 5
damage_type = BRUTE
hitsound = 'sound/effects/splat.ogg'
- knockdown = 30
var/chain
/obj/item/projectile/hook/fire(setAngle)
diff --git a/code/modules/mining/machine_redemption.dm b/code/modules/mining/machine_redemption.dm
index 0268d32a6b..d6c4dfae34 100644
--- a/code/modules/mining/machine_redemption.dm
+++ b/code/modules/mining/machine_redemption.dm
@@ -250,6 +250,8 @@
if(points)
if(I)
I.mining_points += points
+ if(usr.client)
+ usr.client.increment_progress("miner", points)
points = 0
else
to_chat(usr, "No ID detected.")
diff --git a/code/modules/mining/point_bank.dm b/code/modules/mining/point_bank.dm
index f18b62635f..f467b94de5 100644
--- a/code/modules/mining/point_bank.dm
+++ b/code/modules/mining/point_bank.dm
@@ -20,25 +20,6 @@
data["totalPoints"] = points
return data
-/obj/machinery/mineral/ore_redemption/ui_act(action, params)
- if(..())
- return
- switch(action)
- if("Claim")
- var/mob/M = usr
- var/obj/item/card/id/I = M.get_idcard(TRUE)
- if(points)
- if(I)
- I.mining_points += points
- if(usr.client)
- usr.client.increment_progress("miner", points)
- points = 0
- else
- to_chat(usr, "No ID detected.")
- else
- to_chat(usr, "No points to claim.")
- return TRUE
-
/obj/machinery/point_bank/power_change()
..()
update_icon()
diff --git a/code/modules/mob/dead/new_player/new_player.dm b/code/modules/mob/dead/new_player/new_player.dm
index 435fd000c2..4afa7234f9 100644
--- a/code/modules/mob/dead/new_player/new_player.dm
+++ b/code/modules/mob/dead/new_player/new_player.dm
@@ -146,10 +146,58 @@
if(dbflags & DB_FLAG_AGE_CONFIRMATION_INCOMPLETE) //they have not completed age gate
var/age_verification = age_gate()
if(age_verification != 1)
- client.add_system_note("Automated-Age-Gate", "Failed automatic age gate process")
+ client.add_system_note("Automated-Age-Gate", "Failed automatic age gate process.")
//ban them and kick them
- AddBan(client.ckey, client.computer_id, "SYSTEM BAN - Inputted date during join verification was under 18 years of age. Contact administration on discord for verification.", "SYSTEM", FALSE, null, client.address)
+
+ //parameters used by sql line, easier to read:
+ var/bantype_str = "ADMIN_PERMABAN"
+ var/reason = "SYSTEM BAN - Inputted date during join verification was under 18 years of age. Contact administration on discord for verification."
+ var/duration = -1
+ var/sql_ckey = sanitizeSQL(client.ckey)
+ var/computerid = client.computer_id
+ if(!computerid)
+ computerid = "0"
+ var/sql_computerid = sanitizeSQL(computerid)
+ var/ip = client.address
+ if(!ip)
+ ip = "0.0.0.0"
+ var/sql_ip = sanitizeSQL(ip)
+
+ //parameter not used as there's no job but i want to fill out all parameters for the insert line
+ var/sql_job
+
+ // these are typically the banning admin's, but it's the system so we leave them null, but they're still here for the sake of a full set of values
+ var/sql_a_ckey
+ var/sql_a_computerid
+ var/sql_a_ip
+
+ // record all admins and non-admins online at the time
+ var/who
+ for(var/client/C in GLOB.clients)
+ if(!who)
+ who = "[C]"
+ else
+ who += ", [C]"
+
+ var/adminwho
+ for(var/client/C in GLOB.admins)
+ if(!adminwho)
+ adminwho = "[C]"
+ else
+ adminwho += ", [C]"
+
+ var/sql = "INSERT INTO [format_table_name("ban")] (`bantime`,`server_ip`,`server_port`,`round_id`,`bantype`,`reason`,`job`,`duration`,`expiration_time`,`ckey`,`computerid`,`ip`,`a_ckey`,`a_computerid`,`a_ip`,`who`,`adminwho`) VALUES (Now(), INET_ATON(IF('[world.internet_address]' LIKE '', '0', '[world.internet_address]')), '[world.port]', '[GLOB.round_id]', '[bantype_str]', '[reason]', '[sql_job]', [(duration)?"[duration]":"0"], Now() + INTERVAL [(duration>0) ? duration : 0] MINUTE, '[sql_ckey]', '[sql_computerid]', INET_ATON('[sql_ip]'), '[sql_a_ckey]', '[sql_a_computerid]', INET_ATON('[sql_a_ip]'), '[who]', '[adminwho]')"
+ var/datum/DBQuery/query_add_ban = SSdbcore.NewQuery(sql)
+ qdel(query_add_ban)
+
+ // announce this
+ message_admins("[html_encode(client.ckey)] has been banned for failing the automatic age gate.")
+ send2irc("[html_encode(client.ckey)] has been banned for failing the automatic age gate.")
+
+ // removing the client disconnects them
qdel(client)
+
+
return FALSE
else
//they claim to be of age, so allow them to continue and update their flags
diff --git a/code/modules/mob/dead/new_player/sprite_accessories/caps.dm b/code/modules/mob/dead/new_player/sprite_accessories/caps.dm
index 822fcf960d..d974672490 100644
--- a/code/modules/mob/dead/new_player/sprite_accessories/caps.dm
+++ b/code/modules/mob/dead/new_player/sprite_accessories/caps.dm
@@ -1,4 +1,4 @@
-datum/sprite_accessory/caps
+/datum/sprite_accessory/caps
icon = 'icons/mob/mutant_bodyparts.dmi'
color_src = HAIR
relevant_layers = list(BODY_ADJ_LAYER)
diff --git a/code/modules/mob/dead/new_player/sprite_accessories/hair_head.dm b/code/modules/mob/dead/new_player/sprite_accessories/hair_head.dm
index 55ab18c20c..0c22a85886 100644
--- a/code/modules/mob/dead/new_player/sprite_accessories/hair_head.dm
+++ b/code/modules/mob/dead/new_player/sprite_accessories/hair_head.dm
@@ -13,6 +13,10 @@
name = "Bald"
icon_state = "bald"
+/datum/sprite_accessory/hair/adhara
+ name = "Adhara"
+ icon_state = "hair_adhara"
+
/datum/sprite_accessory/hair/afro
name = "Afro"
icon_state = "hair_afro"
@@ -29,6 +33,14 @@
name = "Ahoge"
icon_state = "hair_antenna"
+/datum/sprite_accessory/hair/amazon
+ name = "Amazon"
+ icon_state = "hair_amazon"
+
+/datum/sprite_accessory/hair/anita
+ name = "Anita"
+ icon_state = "hair_anita"
+
/datum/sprite_accessory/hair/balding
name = "Balding Hair"
icon_state = "hair_e"
@@ -61,6 +73,18 @@
name = "Beehive 2"
icon_state = "hair_beehive2"
+/datum/sprite_accessory/hair/belenko
+ name = "Beleneko"
+ icon_state = "hair_belenko"
+
+/datum/sprite_accessory/hair/belenkotied
+ name = "Belenko (Tied)"
+ icon_state = "hair_belenkotied"
+
+/datum/sprite_accessory/hair/belle
+ name = "Belle"
+ icon_state = "hair_belle"
+
/datum/sprite_accessory/hair/bob
name = "Bob Hair"
icon_state = "hair_bob"
@@ -309,6 +333,10 @@
name = "Flow Hair"
icon_state = "hair_f"
+/datum/sprite_accessory/hair/fluffy
+ name = "Fluffy"
+ icon_state = "hair_fluffy"
+
/datum/sprite_accessory/hair/fringetail
name = "Fringe Tail"
icon_state = "hair_fringetail"
@@ -365,6 +393,10 @@
name = "Hitop"
icon_state = "hair_hitop"
+/datum/sprite_accessory/hair/inkling
+ name = "Inkling"
+ icon_state = "hair_inkling"
+
/datum/sprite_accessory/hair/jade
name = "Jade"
icon_state = "hair_jade"
@@ -373,6 +405,10 @@
name = "Jensen"
icon_state = "hair_jensen"
+/datum/sprite_accessory/hair/jessica
+ name = "Jessica"
+ icon_state = "hair_jessica"
+
/datum/sprite_accessory/hair/joestar
name = "Joestar"
icon_state = "hair_joestar"
@@ -389,6 +425,10 @@
name = "Kusanagi"
icon_state = "hair_kusanagi"
+/datum/sprite_accessory/hair/kleeia
+ name = "Kleeia"
+ icon_state = "hair_kleeia"
+
/datum/sprite_accessory/hair/long
name = "Long Hair 1"
icon_state = "hair_long"
@@ -445,6 +485,10 @@
name = "Mohawk"
icon_state = "hair_d"
+/datum/sprite_accessory/hair/newyou
+ name = "New You"
+ icon_state = "hair_newyou"
+
/datum/sprite_accessory/hair/reversemohawk
name = "Mohawk (Reverse)"
icon_state = "hair_reversemohawk"
@@ -575,6 +619,10 @@
name = "Ponytail (Side) 4"
icon_state = "hair_sidetail4"
+/datum/sprite_accessory/hair/sharptail
+ name = "Ponytail (Sharp)"
+ icon_state = "hair_sharptail"
+
/datum/sprite_accessory/hair/spikytail
name = "Ponytail (Spiky)"
icon_state = "hair_spikyponytail"
@@ -679,6 +727,26 @@
name = "Skinhead"
icon_state = "hair_skinhead"
+/datum/sprite_accessory/hair/simple
+ name = "Simple"
+ icon_state = "hair_simple"
+
+/datum/sprite_accessory/hair/skrellvshort
+ name = "Skrell Replicant (Very Short)"
+ icon_state = "hair_skrellvshort"
+
+/datum/sprite_accessory/hair/skrellshort
+ name = "Skrell Replicant (Short)"
+ icon_state = "hair_skrellshort"
+
+/datum/sprite_accessory/hair/skrell
+ name = "Skrell Replicant (Average)"
+ icon_state = "hair_skrell"
+
+/datum/sprite_accessory/hair/skrelllong
+ name = "Skrell Replicant (Long)"
+ icon_state = "hair_skrelllong"
+
/datum/sprite_accessory/hair/sleaze
name = "Sleaze"
icon_state = "hair_sleaze"
@@ -699,6 +767,10 @@
name = "Spiky 3"
icon_state = "hair_spiky2"
+/datum/sprite_accessory/hair/supernova
+ name = "Supernova"
+ icon_state = "hair_supernova"
+
/datum/sprite_accessory/hair/swept
name = "Swept Back Hair"
icon_state = "hair_swept"
@@ -743,6 +815,10 @@
name = "Trimmed (Flat)"
icon_state = "hair_trimflat"
+/datum/sprite_accessory/hair/twincurls
+ name = "Twincurls"
+ icon_state = "hair_twincurls"
+
/datum/sprite_accessory/hair/twintails
name = "Twintails"
icon_state = "hair_twintail"
@@ -787,6 +863,10 @@
name = "Very Short Over Eye (Alt)"
icon_state = "hair_veryshortovereyealternate"
+/datum/sprite_accessory/hair/vivi
+ name = "Vivi"
+ icon_state = "hair_vivi"
+
/datum/sprite_accessory/hair/volaju
name = "Volaju"
icon_state = "hair_volaju"
diff --git a/code/modules/mob/dead/new_player/sprite_accessories/socks.dm b/code/modules/mob/dead/new_player/sprite_accessories/socks.dm
index cd55a17e3c..78517b003e 100644
--- a/code/modules/mob/dead/new_player/sprite_accessories/socks.dm
+++ b/code/modules/mob/dead/new_player/sprite_accessories/socks.dm
@@ -11,6 +11,11 @@
// please make sure they're sorted alphabetically and categorized
+/datum/sprite_accessory/underwear/socks/garter
+ name = "Garter"
+ icon_state = "garter"
+ has_color = TRUE
+
/datum/sprite_accessory/underwear/socks/socks_knee
name = "Knee-high"
icon_state = "socks_knee"
@@ -83,6 +88,10 @@
name = "Pantyhose"
icon_state = "pantyhose"
+/datum/sprite_accessory/underwear/socks/pantyhose_ripped
+ name = "Pantyhose - Ripped"
+ icon_state = "pantyhose_ripped"
+
/datum/sprite_accessory/underwear/socks/socks_short
name = "Short"
icon_state = "socks_short"
diff --git a/code/modules/mob/dead/new_player/sprite_accessories/tails.dm b/code/modules/mob/dead/new_player/sprite_accessories/tails.dm
index 6135d42569..a964be3f8a 100644
--- a/code/modules/mob/dead/new_player/sprite_accessories/tails.dm
+++ b/code/modules/mob/dead/new_player/sprite_accessories/tails.dm
@@ -757,7 +757,7 @@
icon_state = "husky"
matrixed_sections = MATRIX_RED_GREEN
-datum/sprite_accessory/tails/mam_tails/insect
+/datum/sprite_accessory/tails/mam_tails/insect
name = "Insect"
icon_state = "insect"
matrixed_sections = MATRIX_RED
diff --git a/code/modules/mob/dead/new_player/sprite_accessories/undershirt.dm b/code/modules/mob/dead/new_player/sprite_accessories/undershirt.dm
index 1be02c207e..364485fe8a 100644
--- a/code/modules/mob/dead/new_player/sprite_accessories/undershirt.dm
+++ b/code/modules/mob/dead/new_player/sprite_accessories/undershirt.dm
@@ -343,6 +343,20 @@
icon_state = "fishnet_body"
gender = FEMALE
+/datum/sprite_accessory/underwear/top/shibari
+ name = "Shibari Ropes"
+ icon_state = "shibari"
+ gender = FEMALE
+ has_color = TRUE
+ covers_chest = FALSE
+
+/datum/sprite_accessory/underwear/top/shibari_sleeved
+ name = "Shibari Ropes - sleeves"
+ icon_state = "shibari_sleeves"
+ gender = FEMALE
+ has_color = TRUE
+ covers_chest = FALSE
+
/datum/sprite_accessory/underwear/top/swimsuit
name = "Swimsuit Top"
icon_state = "bra_swimming"
diff --git a/code/modules/mob/dead/observer/observer.dm b/code/modules/mob/dead/observer/observer.dm
index dc53f9487f..783f55d12d 100644
--- a/code/modules/mob/dead/observer/observer.dm
+++ b/code/modules/mob/dead/observer/observer.dm
@@ -556,7 +556,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=1) //Fill list, prompt user with list
+ dest += getpois(mobs_only = TRUE) //Fill list, prompt user with list
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
@@ -893,7 +893,9 @@ This is the proc mobs get to turn into a ghost. Forked from ghostize due to comp
if (!eye_name)
return
- var/mob/mob_eye = creatures[eye_name]
+ do_observe(creatures[eye_name])
+
+/mob/dead/observer/proc/do_observe(mob/mob_eye)
//Istype so we filter out points of interest that are not mobs
if(client && mob_eye && istype(mob_eye))
client.eye = mob_eye
diff --git a/code/modules/mob/dead/observer/orbit.dm b/code/modules/mob/dead/observer/orbit.dm
index 3aa5f8e302..26494dcb34 100644
--- a/code/modules/mob/dead/observer/orbit.dm
+++ b/code/modules/mob/dead/observer/orbit.dm
@@ -1,5 +1,6 @@
/datum/orbit_menu
var/mob/dead/observer/owner
+ var/auto_observe = FALSE
/datum/orbit_menu/New(mob/dead/observer/new_owner)
if(!istype(new_owner))
@@ -10,6 +11,7 @@
return GLOB.observer_state
/datum/orbit_menu/ui_interact(mob/user, datum/tgui/ui)
+ ui = SStgui.try_update_ui(user, src, ui)
if (!ui)
ui = new(user, src, "Orbit")
ui.open()
@@ -18,15 +20,35 @@
if (..())
return
- if (action == "orbit")
- var/ref = params["ref"]
- var/atom/movable/poi = (locate(ref) in GLOB.mob_list) || (locate(ref) in GLOB.poi_list)
- if (poi != null)
+ 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
owner.ManualFollow(poi)
+ owner.reset_perspective(null)
+ 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
+ return data
+/datum/orbit_menu/ui_static_data(mob/user)
+ var/list/data = list()
var/list/alive = list()
var/list/antagonists = list()
var/list/dead = list()
@@ -34,7 +56,7 @@
var/list/misc = list()
var/list/npcs = list()
- var/list/pois = getpois(skip_mindless = 1)
+ var/list/pois = getpois(skip_mindless = TRUE, specify_dead_role = FALSE)
for (var/name in pois)
var/list/serialized = list()
serialized["name"] = name
@@ -80,7 +102,7 @@
data["npcs"] = npcs
return data
-
+
/datum/orbit_menu/ui_assets()
. = ..() || list()
. += get_asset_datum(/datum/asset/simple/orbit)
diff --git a/code/modules/mob/death.dm b/code/modules/mob/death.dm
index 09336d2fea..476bddded3 100644
--- a/code/modules/mob/death.dm
+++ b/code/modules/mob/death.dm
@@ -1,6 +1,6 @@
//This is the proc for gibbing a mob. Cannot gib ghosts.
//added different sort of gibs and animations. N
-/mob/proc/gib()
+/mob/proc/gib(no_brain, no_organs, no_bodyparts, datum/explosion/was_explosion)
return
//This is the proc for turning a mob into ash. Mostly a copy of gib code (above).
diff --git a/code/modules/mob/living/carbon/alien/alien.dm b/code/modules/mob/living/carbon/alien/alien.dm
index e7ad67d240..f5970d9da2 100644
--- a/code/modules/mob/living/carbon/alien/alien.dm
+++ b/code/modules/mob/living/carbon/alien/alien.dm
@@ -4,7 +4,6 @@
gender = FEMALE //All xenos are girls!!
dna = null
faction = list(ROLE_ALIEN)
- ventcrawler = VENTCRAWLER_ALWAYS
sight = SEE_MOBS
see_in_dark = 4
verb_say = "hisses"
@@ -12,6 +11,10 @@
bubble_icon = "alien"
type_of_meat = /obj/item/reagent_containers/food/snacks/meat/slab/xeno
+ /// Whether they can ventcrawl; this is set individually for 'humanoid' and 'royal' types
+ /// 'royal' types (Praetorian, Queen) cannot ventcrawl
+ var/can_ventcrawl
+
/// How much brute damage without armor piercing they do against mobs in melee
var/meleeSlashHumanPower = 20
/// How much power they have for DefaultCombatKnockdown when attacking humans
@@ -19,7 +22,6 @@
/// How much brute damage they do to simple animals
var/meleeSlashSAPower = 35
- var/obj/item/card/id/wear_id = null // Fix for station bounced radios -- Skie
var/has_fine_manipulation = 0
var/move_delay_add = 0 // movement delay to add
@@ -40,6 +42,9 @@
create_internal_organs()
+ if(can_ventcrawl)
+ AddElement(/datum/element/ventcrawling, given_tier = VENTCRAWLER_ALWAYS)
+
. = ..()
/mob/living/carbon/alien/create_internal_organs()
diff --git a/code/modules/mob/living/carbon/alien/humanoid/humanoid.dm b/code/modules/mob/living/carbon/alien/humanoid/humanoid.dm
index d0addbab21..0d2a1c0c59 100644
--- a/code/modules/mob/living/carbon/alien/humanoid/humanoid.dm
+++ b/code/modules/mob/living/carbon/alien/humanoid/humanoid.dm
@@ -20,6 +20,8 @@
bodyparts = list(/obj/item/bodypart/chest/alien, /obj/item/bodypart/head/alien, /obj/item/bodypart/l_arm/alien,
/obj/item/bodypart/r_arm/alien, /obj/item/bodypart/r_leg/alien, /obj/item/bodypart/l_leg/alien)
+ can_ventcrawl = TRUE
+
//This is fine right now, if we're adding organ specific damage this needs to be updated
/mob/living/carbon/alien/humanoid/Initialize()
diff --git a/code/modules/mob/living/carbon/alien/humanoid/queen.dm b/code/modules/mob/living/carbon/alien/humanoid/queen.dm
index 91a61efea6..bcc83f14f9 100644
--- a/code/modules/mob/living/carbon/alien/humanoid/queen.dm
+++ b/code/modules/mob/living/carbon/alien/humanoid/queen.dm
@@ -2,7 +2,6 @@
//Common stuffs for Praetorian and Queen
icon = 'icons/mob/alienqueen.dmi'
status_flags = 0
- ventcrawler = VENTCRAWLER_NONE //pull over that ass too fat
unique_name = 0
pixel_x = -16
bubble_icon = "alienroyal"
@@ -10,6 +9,7 @@
layer = LARGE_MOB_LAYER //above most mobs, but below speechbubbles
pressure_resistance = 200 //Because big, stompy xenos should not be blown around like paper.
butcher_results = list(/obj/item/reagent_containers/food/snacks/meat/slab/xeno = 20, /obj/item/stack/sheet/animalhide/xeno = 3)
+ can_ventcrawl = FALSE
meleeKnockdownPower = 125
meleeSlashHumanPower = 30
diff --git a/code/modules/mob/living/carbon/alien/larva/larva.dm b/code/modules/mob/living/carbon/alien/larva/larva.dm
index 8f0ef2b384..77c9a8c579 100644
--- a/code/modules/mob/living/carbon/alien/larva/larva.dm
+++ b/code/modules/mob/living/carbon/alien/larva/larva.dm
@@ -11,6 +11,8 @@
maxHealth = 25
health = 25
+ can_ventcrawl = TRUE
+
var/amount_grown = 0
var/max_grown = 100
var/time_of_birth
diff --git a/code/modules/mob/living/carbon/carbon.dm b/code/modules/mob/living/carbon/carbon.dm
index 45a0d82d2c..f143f6302d 100644
--- a/code/modules/mob/living/carbon/carbon.dm
+++ b/code/modules/mob/living/carbon/carbon.dm
@@ -434,6 +434,9 @@
legcuffed.forceMove(drop_location())
legcuffed = null
I.dropped(src)
+ if(istype(I, /obj/item/restraints/legcuffs))
+ var/obj/item/restraints/legcuffs/lgcf = I
+ lgcf.on_removed()
update_inv_legcuffed()
return
else
@@ -1229,3 +1232,25 @@
*/
/mob/living/carbon/proc/get_biological_state()
return BIO_FLESH_BONE
+
+/mob/living/carbon/altattackby(obj/item/W, mob/living/carbon/user, params)
+ if(user.incapacitated() || !user.Adjacent(src))
+ return FALSE
+ if(W && user.a_intent == INTENT_HELP && W.can_give())
+ user.give()
+ return TRUE
+
+/mob/living/carbon/verb/give_verb()
+ set src in oview(1)
+ set category = "IC"
+ set name = "Give"
+
+ if(usr.incapacitated() || !usr.Adjacent(src))
+ return
+
+ if(!usr.get_active_held_item()) // Let me know if this has any problems -Yota
+ return
+ var/obj/item/I = usr.get_active_held_item()
+ var/mob/living/carbon/C = usr
+ if(I.can_give())
+ C.give()
diff --git a/code/modules/mob/living/carbon/death.dm b/code/modules/mob/living/carbon/death.dm
index ee2f945b65..528848fb14 100644
--- a/code/modules/mob/living/carbon/death.dm
+++ b/code/modules/mob/living/carbon/death.dm
@@ -17,7 +17,7 @@
if(SSticker.mode)
SSticker.mode.check_win() //Calls the rounds wincheck, mainly for wizard, malf, and changeling now
-/mob/living/carbon/gib(no_brain, no_organs, no_bodyparts)
+/mob/living/carbon/gib(no_brain, no_organs, no_bodyparts, datum/explosion/was_explosion)
var/atom/Tsec = drop_location()
for(var/mob/M in src)
if(M in stomach_contents)
@@ -27,7 +27,7 @@
"You burst out of [src]!")
..()
-/mob/living/carbon/spill_organs(no_brain, no_organs, no_bodyparts)
+/mob/living/carbon/spill_organs(no_brain, no_organs, no_bodyparts, datum/explosion/was_explosion)
var/atom/Tsec = drop_location()
if(!no_bodyparts)
if(no_organs)//so the organs don't get transfered inside the bodyparts we'll drop.
@@ -41,6 +41,8 @@
qdel(O) //so the brain isn't transfered to the head when the head drops.
continue
if(!(O.organ_flags & ORGAN_NO_DISMEMBERMENT) && check_zone(O.zone) == BODY_ZONE_CHEST)
+ if(was_explosion)
+ LAZYADD(O.acted_explosions, was_explosion.explosion_id)
O.Remove()
O.forceMove(Tsec)
O.throw_at(get_edge_target_turf(src,pick(GLOB.alldirs)),rand(1,3),5)
@@ -50,13 +52,16 @@
if(I.organ_flags & ORGAN_NO_DISMEMBERMENT || (no_brain && istype(I, /obj/item/organ/brain)) || (no_organs && !istype(I, /obj/item/organ/brain)))
qdel(I)
continue
+ if(was_explosion)
+ LAZYADD(I.acted_explosions, was_explosion.explosion_id)
I.Remove()
I.forceMove(Tsec)
I.throw_at(get_edge_target_turf(src,pick(GLOB.alldirs)),rand(1,3),5)
-
-/mob/living/carbon/spread_bodyparts()
+/mob/living/carbon/spread_bodyparts(no_brain, no_organs, datum/explosion/was_explosion)
for(var/X in bodyparts)
var/obj/item/bodypart/BP = X
+ if(was_explosion)
+ LAZYADD(BP.acted_explosions, was_explosion.explosion_id)
BP.drop_limb()
BP.throw_at(get_edge_target_turf(src,pick(GLOB.alldirs)),rand(1,3),5)
diff --git a/code/modules/mob/living/carbon/human/human.dm b/code/modules/mob/living/carbon/human/human.dm
index df7ed66169..8660e115a6 100644
--- a/code/modules/mob/living/carbon/human/human.dm
+++ b/code/modules/mob/living/carbon/human/human.dm
@@ -281,11 +281,13 @@
dropItemToGround(pocket_item)
if(!usr.can_hold_items() || !usr.put_in_hands(pocket_item))
pocket_item.forceMove(drop_location())
+ log_combat(usr, src, "pickpocketed of item: [pocket_item]")
else
if(place_item)
if(place_item.mob_can_equip(src, usr, pocket_id, FALSE, TRUE))
usr.temporarilyRemoveItemFromInventory(place_item, TRUE)
equip_to_slot(place_item, pocket_id, TRUE)
+ log_combat(usr, src, "placed item [place_item] onto")
//do nothing otherwise
// Update strip window
@@ -293,8 +295,9 @@
show_inv(usr)
else
// Display a warning if the user mocks up
- if (!strip_silence)
+ if(!strip_silence)
to_chat(src, "You feel your [pocket_side] pocket being fumbled with!")
+ log_combat(usr, src, "failed to [pocket_item ? "pickpocket item [pocket_item] from" : "place item [place_item] onto "]")
if(usr.canUseTopic(src, BE_CLOSE, NO_DEXTERY, null, FALSE))
// separate from first canusetopic
@@ -938,43 +941,43 @@
admin_ticket_log(src, msg)
/mob/living/carbon/human/MouseDrop_T(mob/living/target, mob/living/user)
- if(pulling == target && grab_state >= GRAB_AGGRESSIVE && stat == CONSCIOUS)
+ var/GS_needed = istype(target, /mob/living/silicon/pai)? GRAB_PASSIVE : GRAB_AGGRESSIVE
+ if(pulling == target && grab_state >= GS_needed && stat == CONSCIOUS)
//If they dragged themselves and we're currently aggressively grabbing them try to piggyback
if(user == target && can_piggyback(target))
piggyback(target)
return
//If you dragged them to you and you're aggressively grabbing try to fireman carry them
- else if(user != target)
+ else if(user == src)
if(user.a_intent == INTENT_GRAB)
fireman_carry(target)
return
. = ..()
//src is the user that will be carrying, target is the mob to be carried
-/mob/living/carbon/human/proc/can_piggyback(mob/living/carbon/target)
- return (istype(target) && target.stat == CONSCIOUS)
+/mob/living/carbon/human/proc/can_piggyback(mob/living/target)
+ return (iscarbon(target) || ispAI(target)) && target.stat == CONSCIOUS
/mob/living/carbon/human/proc/can_be_firemanned(mob/living/carbon/target)
- return (ishuman(target) && !CHECK_MOBILITY(target, MOBILITY_STAND))
+ return (ishuman(target) && !CHECK_MOBILITY(target, MOBILITY_STAND)) || ispAI(target)
/mob/living/carbon/human/proc/fireman_carry(mob/living/carbon/target)
var/carrydelay = 50 //if you have latex you are faster at grabbing
var/skills_space = "" //cobby told me to do this
if(HAS_TRAIT(src, TRAIT_QUICKER_CARRY))
carrydelay = 30
- skills_space = "expertly"
+ skills_space = "expertly "
else if(HAS_TRAIT(src, TRAIT_QUICK_CARRY))
carrydelay = 40
- skills_space = "quickly"
+ skills_space = "quickly "
if(can_be_firemanned(target) && !incapacitated(FALSE, TRUE))
- visible_message("[src] starts [skills_space] lifting [target] onto their back..",
+ visible_message("[src] starts [skills_space]lifting [target] onto their back..",
//Joe Medic starts quickly/expertly lifting Grey Tider onto their back..
- "[carrydelay < 35 ? "Using your gloves' nanochips, you" : "You"] [skills_space] start to lift [target] onto your back[carrydelay == 40 ? ", while assisted by the nanochips in your gloves.." : "..."]")
+ "[carrydelay < 35 ? "Using your gloves' nanochips, you" : "You"] [skills_space]start to lift [target] onto your back[carrydelay == 40 ? ", while assisted by the nanochips in your gloves.." : "..."]")
//(Using your gloves' nanochips, you/You) ( /quickly/expertly) start to lift Grey Tider onto your back(, while assisted by the nanochips in your gloves../...)
if(do_after(src, carrydelay, TRUE, target))
//Second check to make sure they're still valid to be carried
if(can_be_firemanned(target) && !incapacitated(FALSE, TRUE))
- target.set_resting(FALSE, TRUE)
buckle_mob(target, TRUE, TRUE, 90, 1, 0, TRUE)
return
visible_message("[src] fails to fireman carry [target]!")
@@ -992,13 +995,13 @@
if(target.incapacitated(FALSE, TRUE) || incapacitated(FALSE, TRUE))
target.visible_message("[target] can't hang onto [src]!")
return
- buckle_mob(target, TRUE, TRUE, FALSE, 1, 2, FALSE)
+ buckle_mob(target, TRUE, TRUE, 0, 1, 2, FALSE)
else
visible_message("[target] fails to climb onto [src]!")
else
to_chat(target, "You can't piggyback ride [src] right now!")
-/mob/living/carbon/human/buckle_mob(mob/living/target, force = FALSE, check_loc = TRUE, lying_buckle = FALSE, hands_needed = 0, target_hands_needed = 0, fireman = FALSE)
+/mob/living/carbon/human/buckle_mob(mob/living/target, force = FALSE, check_loc = TRUE, lying_buckle = 0, hands_needed = 0, target_hands_needed = 0, fireman = FALSE)
if(!force)//humans are only meant to be ridden through piggybacking and special cases
return
if(!is_type_in_typecache(target, can_ride_typecache))
@@ -1010,6 +1013,9 @@
riding_datum.ride_check_rider_restrained = TRUE
if(buckled_mobs && ((target in buckled_mobs) || (buckled_mobs.len >= max_buckled_mobs)) || buckled)
return
+ if(istype(target, /mob/living/silicon/pai))
+ hands_needed = 1
+ target_hands_needed = 0
var/equipped_hands_self
var/equipped_hands_target
if(hands_needed)
diff --git a/code/modules/mob/living/carbon/human/human_defines.dm b/code/modules/mob/living/carbon/human/human_defines.dm
index a82151cc1d..772022a987 100644
--- a/code/modules/mob/living/carbon/human/human_defines.dm
+++ b/code/modules/mob/living/carbon/human/human_defines.dm
@@ -71,7 +71,7 @@
var/list/datum/bioware = list()
var/creamed = FALSE //to use with creampie overlays
- var/static/list/can_ride_typecache = typecacheof(list(/mob/living/carbon/human, /mob/living/simple_animal/slime, /mob/living/simple_animal/parrot))
+ var/static/list/can_ride_typecache = typecacheof(list(/mob/living/carbon/human, /mob/living/simple_animal/slime, /mob/living/simple_animal/parrot, /mob/living/silicon/pai))
var/lastpuke = 0
var/account_id
var/last_fire_update
@@ -95,9 +95,10 @@
parry_efficiency_considered_successful = 0.01
parry_efficiency_to_counterattack = 0.01
parry_max_attacks = 3
- parry_cooldown = 30
- parry_failed_stagger_duration = 0
- parry_failed_clickcd_duration = 0.4
+ parry_cooldown = 3 SECONDS
+ parry_failed_cooldown_duration = 1.5 SECONDS
+ parry_failed_stagger_duration = 1 SECONDS
+ parry_failed_clickcd_duration = 0.4 SECONDS
parry_data = list( // yeah it's snowflake
"UNARMED_PARRY_STAGGER" = 3 SECONDS,
@@ -135,16 +136,16 @@
parry_imperfect_falloff_percent = 20
parry_efficiency_perfect = 100
parry_efficiency_perfect_override = list(
- ATTACK_TYPE_PROJECTILE_TEXT = 60,
+ TEXT_ATTACK_TYPE_PROJECTILE = 60,
)
parry_efficiency_considered_successful = 0.01
parry_efficiency_to_counterattack = 0.01
parry_max_attacks = INFINITY
- parry_failed_cooldown_duration = 1.5 SECONDS
- parry_failed_stagger_duration = 0
- parry_cooldown = 0
- parry_failed_clickcd_duration = 0.8
+ parry_failed_cooldown_duration = 3 SECONDS
+ parry_failed_stagger_duration = 2 SECONDS
+ parry_cooldown = 3 SECONDS
+ parry_failed_clickcd_duration = 0.8 SECONDS
parry_data = list( // yeah it's snowflake
"UNARMED_PARRY_STAGGER" = 3 SECONDS,
diff --git a/code/modules/mob/living/carbon/human/species.dm b/code/modules/mob/living/carbon/human/species.dm
index 94d7e84c6b..c3cdb3354f 100644
--- a/code/modules/mob/living/carbon/human/species.dm
+++ b/code/modules/mob/living/carbon/human/species.dm
@@ -1425,8 +1425,6 @@ GLOBAL_LIST_EMPTY(roundstart_race_names)
var/damage = rand(user.dna.species.punchdamagelow, user.dna.species.punchdamagehigh)
var/punchwoundbonus = user.dna.species.punchwoundbonus
- var/puncherstam = user.getStaminaLoss()
- var/puncherbrute = user.getBruteLoss()
var/punchedstam = target.getStaminaLoss()
var/punchedbrute = target.getBruteLoss()
@@ -1434,7 +1432,7 @@ GLOBAL_LIST_EMPTY(roundstart_race_names)
if(!SEND_SIGNAL(target, COMSIG_COMBAT_MODE_CHECK, COMBAT_MODE_INACTIVE))
damage *= 1.2
if(!CHECK_MOBILITY(user, MOBILITY_STAND))
- damage *= 0.8
+ damage *= 0.65
if(SEND_SIGNAL(user, COMSIG_COMBAT_MODE_CHECK, COMBAT_MODE_INACTIVE))
damage *= 0.8
//END OF CITADEL CHANGES
@@ -1446,19 +1444,7 @@ GLOBAL_LIST_EMPTY(roundstart_race_names)
if(!affecting) //Maybe the bodypart is missing? Or things just went wrong..
affecting = target.get_bodypart(BODY_ZONE_CHEST) //target chest instead, as failsafe. Or hugbox? You decide.
- var/miss_chance = 100//calculate the odds that a punch misses entirely. considers stamina and brute damage of the puncher. punches miss by default to prevent weird cases
- if(attackchain_flags & ATTACK_IS_PARRY_COUNTERATTACK)
- miss_chance = 0
- else
- if(user.dna.species.punchdamagelow)
- if(atk_verb == ATTACK_EFFECT_KICK) //kicks never miss (provided your species deals more than 0 damage)
- miss_chance = 0
- else if(HAS_TRAIT(user, TRAIT_PUGILIST)) //pugilists, being good at Punching People, also never miss
- miss_chance = 0
- else
- miss_chance = min(10 + max(puncherstam * 0.5, puncherbrute * 0.5), 100) //probability of miss has a base of 10, and modified based on half brute total. Capped at max 100 to prevent weirdness in prob()
-
- if(!damage || !affecting || prob(miss_chance))//future-proofing for species that have 0 damage/weird cases where no zone is targeted
+ if(!damage || !affecting)//future-proofing for species that have 0 damage/weird cases where no zone is targeted
playsound(target.loc, user.dna.species.miss_sound, 25, TRUE, -1)
target.visible_message("[user]'s [atk_verb] misses [target]!", \
"You avoid [user]'s [atk_verb]!", "You hear a swoosh!", null, COMBAT_MESSAGE_RANGE, null, \
@@ -1796,12 +1782,10 @@ GLOBAL_LIST_EMPTY(roundstart_race_names)
"[M] attempted to touch you!", target = M, \
target_message = "You attempted to touch [H]!")
return TRUE
+ if(M == H)
+ althelp(M, H, attacker_style)
+ return TRUE
switch(M.a_intent)
- if(INTENT_HELP)
- if(M == H)
- althelp(M, H, attacker_style)
- return TRUE
- return FALSE
if(INTENT_DISARM)
altdisarm(M, H, attacker_style)
return TRUE
@@ -1987,6 +1971,8 @@ GLOBAL_LIST_EMPTY(roundstart_race_names)
H.show_message("The radiation beam dissipates harmlessly through your body.")
if(/obj/item/projectile/energy/florayield)
H.show_message("The radiation beam dissipates harmlessly through your body.")
+ if(/obj/item/projectile/energy/florarevolution)
+ H.show_message("The radiation beam dissipates harmlessly through your body.")
/datum/species/proc/bullet_act(obj/item/projectile/P, mob/living/carbon/human/H)
// called before a projectile hit
diff --git a/code/modules/mob/living/carbon/human/species_types/dwarves.dm b/code/modules/mob/living/carbon/human/species_types/dwarves.dm
index 7c35ade4f2..e0a9bcaa36 100644
--- a/code/modules/mob/living/carbon/human/species_types/dwarves.dm
+++ b/code/modules/mob/living/carbon/human/species_types/dwarves.dm
@@ -30,10 +30,7 @@ GLOBAL_LIST_INIT(dwarf_last, world.file2list("strings/names/dwarf_last.txt")) //
/datum/species/dwarf/on_species_gain(mob/living/carbon/C, datum/species/old_species)
. = ..()
- var/dwarf_hair = pick("Beard (Dwarf)", "Beard (Very Long)", "Beard (Long)") //beard roullette
var/mob/living/carbon/human/H = C
- H.facial_hair_style = dwarf_hair
- H.update_hair()
H.AddElement(/datum/element/dwarfism, COMSIG_SPECIES_LOSS, src)
RegisterSignal(C, COMSIG_MOB_SAY, .proc/handle_speech) //We register handle_speech is being used.
diff --git a/code/modules/mob/living/carbon/human/species_types/golems.dm b/code/modules/mob/living/carbon/human/species_types/golems.dm
index ff0287d7b9..75aff774ce 100644
--- a/code/modules/mob/living/carbon/human/species_types/golems.dm
+++ b/code/modules/mob/living/carbon/human/species_types/golems.dm
@@ -801,11 +801,11 @@
/datum/species/golem/plastic/on_species_gain(mob/living/carbon/C, datum/species/old_species)
. = ..()
- C.ventcrawler = VENTCRAWLER_NUDE
+ C.AddElement(/datum/element/ventcrawling, given_tier = VENTCRAWLER_ALWAYS)
/datum/species/golem/plastic/on_species_loss(mob/living/carbon/C)
. = ..()
- C.ventcrawler = initial(C.ventcrawler)
+ C.RemoveElement(/datum/element/ventcrawling, given_tier = VENTCRAWLER_ALWAYS)
/datum/species/golem/bronze
name = "Bronze Golem"
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 c25c5efb6c..697c3db35e 100644
--- a/code/modules/mob/living/carbon/human/species_types/podpeople.dm
+++ b/code/modules/mob/living/carbon/human/species_types/podpeople.dm
@@ -64,6 +64,11 @@
H.show_message("The radiation beam singes you!")
if(/obj/item/projectile/energy/florayield)
H.adjust_nutrition(30, NUTRITION_LEVEL_FULL)
+ if(/obj/item/projectile/energy/florarevolution)
+ H.show_message("The radiation beam leaves you feeling disoriented!")
+ H.Dizzy(15)
+ H.emote("flip")
+ H.emote("spin")
/datum/species/pod/pseudo_weak
name = "Anthromorphic Plant"
diff --git a/code/modules/mob/living/carbon/human/species_types/vampire.dm b/code/modules/mob/living/carbon/human/species_types/vampire.dm
index 558fdc6594..5e07150ce6 100644
--- a/code/modules/mob/living/carbon/human/species_types/vampire.dm
+++ b/code/modules/mob/living/carbon/human/species_types/vampire.dm
@@ -169,7 +169,7 @@
if(istype(H, /mob/living/simple_animal))
var/mob/living/simple_animal/SA = H
if((human_caster.blood_volume <= (BLOOD_VOLUME_BAD*human_caster.blood_ratio)) || (ventcrawl_nude_only && length(human_caster.get_equipped_items(include_pockets = TRUE))))
- SA.ventcrawler = FALSE
+ SA.RemoveElement(/datum/element/ventcrawling, given_tier = VENTCRAWLER_ALWAYS)
if(transfer_name)
H.name = human_caster.name
diff --git a/code/modules/mob/living/carbon/inventory.dm b/code/modules/mob/living/carbon/inventory.dm
index 96dab9e95d..e5ba022277 100644
--- a/code/modules/mob/living/carbon/inventory.dm
+++ b/code/modules/mob/living/carbon/inventory.dm
@@ -159,3 +159,57 @@
/mob/living/carbon/proc/get_holding_bodypart_of_item(obj/item/I)
var/index = get_held_index_of_item(I)
return index && hand_bodyparts[index]
+
+/**
+ * Proc called when giving an item to another player
+ *
+ * This handles creating an alert and adding an overlay to it
+ */
+/mob/living/carbon/proc/give(target)
+ var/obj/item/receiving = get_active_held_item()
+ if(!receiving)
+ to_chat(src, "You're not holding anything to give!")
+ return
+ visible_message("[src] is offering [receiving]", \
+ "You offer [receiving]", null, 2)
+ var/mob/living/carbon/targets = list()
+ if(!target)
+ for(var/mob/living/carbon/C in orange(1, src))
+ if(!CanReach(C))
+ return
+ targets += C
+ else
+ targets += target
+ if(!targets)
+ return
+ for(var/mob/living/carbon/C in targets)
+ var/obj/screen/alert/give/G = C.throw_alert("[src]", /obj/screen/alert/give)
+ if(!G)
+ return
+ G.setup(C, src, receiving)
+
+/**
+ * Proc called when the player clicks the give alert
+ *
+ * Handles checking if the player taking the item has open slots and is in range of the giver
+ * Also deals with the actual transferring of the item to the players hands
+ * Arguments:
+ * * giver - The person giving the original item
+ * * I - The item being given by the giver
+ */
+/mob/living/carbon/proc/take(mob/living/carbon/giver, obj/item/I)
+ clear_alert("[giver]")
+ if(get_dist(src, giver) > 1)
+ to_chat(src, "[giver] is out of range! ")
+ return
+ if(!I || giver.get_active_held_item() != I)
+ to_chat(src, "[giver] is no longer holding the item they were offering! ")
+ return
+ if(!get_empty_held_indexes())
+ to_chat(src, "You have no empty hands!")
+ return
+ if(!giver.temporarilyRemoveItemFromInventory(I))
+ visible_message("[src] tries to hand over [I] but it's stuck to them....", \
+ " You make a fool of yourself trying to give away an item stuck to your hands")
+ return
+ put_in_hands(I)
diff --git a/code/modules/mob/living/carbon/monkey/monkey.dm b/code/modules/mob/living/carbon/monkey/monkey.dm
index 1f3e0a1b81..d49059f839 100644
--- a/code/modules/mob/living/carbon/monkey/monkey.dm
+++ b/code/modules/mob/living/carbon/monkey/monkey.dm
@@ -6,7 +6,6 @@
icon_state = ""
gender = NEUTER
pass_flags = PASSTABLE
- ventcrawler = VENTCRAWLER_NUDE
mob_biotypes = MOB_ORGANIC|MOB_HUMANOID
butcher_results = list(/obj/item/reagent_containers/food/snacks/meat/slab/monkey = 5, /obj/item/stack/sheet/animalhide/monkey = 1)
type_of_meat = /obj/item/reagent_containers/food/snacks/meat/slab/monkey
@@ -29,6 +28,8 @@
create_bodyparts()
create_internal_organs()
+ AddElement(/datum/element/ventcrawling, given_tier = VENTCRAWLER_NUDE)
+
. = ..()
if (cubespawned)
diff --git a/code/modules/mob/living/carbon/say.dm b/code/modules/mob/living/carbon/say.dm
index 27d0e9cbaf..d75843a3e5 100644
--- a/code/modules/mob/living/carbon/say.dm
+++ b/code/modules/mob/living/carbon/say.dm
@@ -10,6 +10,8 @@
/mob/living/carbon/can_speak_vocal(message)
if(silent)
return 0
+ if(get_message_language(message) == /datum/language/signlanguage && (handcuffed || (!src.get_bodypart(BODY_ZONE_L_ARM) && !src.get_bodypart(BODY_ZONE_R_ARM)) || get_num_held_items() == held_items.len))
+ return 0
return ..()
/mob/living/carbon/could_speak_language(datum/language/language)
diff --git a/code/modules/mob/living/death.dm b/code/modules/mob/living/death.dm
index 688b0cf63e..be9cd0aabb 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, datum/explosion/was_explosion)
var/prev_lying = lying
if(stat != DEAD)
death(1)
@@ -6,22 +6,22 @@
if(!prev_lying)
gib_animation()
- spill_organs(no_brain, no_organs, no_bodyparts)
+ spill_organs(no_brain, no_organs, no_bodyparts, was_explosion)
if(!no_bodyparts)
- spread_bodyparts(no_brain, no_organs)
+ spread_bodyparts(no_brain, no_organs, was_explosion)
for(var/X in implants)
var/obj/item/implant/I = X
qdel(I)
- spawn_gibs(no_bodyparts)
+ spawn_gibs(no_bodyparts, null, was_explosion)
qdel(src)
/mob/living/proc/gib_animation()
return
-/mob/living/proc/spawn_gibs(with_bodyparts, atom/loc_override)
+/mob/living/proc/spawn_gibs(with_bodyparts, atom/loc_override, datum/explosion/was_explosion)
var/location = loc_override ? loc_override.drop_location() : drop_location()
if(mob_biotypes & MOB_ROBOTIC)
new /obj/effect/gibspawner/robot(location, src, get_static_viruses())
@@ -31,7 +31,7 @@
/mob/living/proc/spill_organs()
return
-/mob/living/proc/spread_bodyparts()
+/mob/living/proc/spread_bodyparts(no_brain, no_organs, datum/explosion/was_explosion)
return
/mob/living/dust(just_ash, drop_items, force)
diff --git a/code/modules/mob/living/living.dm b/code/modules/mob/living/living.dm
index fcc1d734a3..6aaa2cca87 100644
--- a/code/modules/mob/living/living.dm
+++ b/code/modules/mob/living/living.dm
@@ -866,7 +866,7 @@
if(istype(G))
strip_mod = G.strip_mod
strip_silence = G.strip_silence
- if (!strip_silence)
+ if(!strip_silence)
who.visible_message("[src] tries to remove [who]'s [what.name].", \
"[src] tries to remove your [what.name].", target = src,
target_message = "You try to remove [who]'s [what.name].")
diff --git a/code/modules/mob/living/living_active_parry.dm b/code/modules/mob/living/living_active_parry.dm
index 8d1ee38de6..c0423286c1 100644
--- a/code/modules/mob/living/living_active_parry.dm
+++ b/code/modules/mob/living/living_active_parry.dm
@@ -2,7 +2,7 @@
/**
* Determines if we can actively parry.
*/
-/obj/item/proc/can_active_parry()
+/obj/item/proc/can_active_parry(mob/user)
return block_parry_data && (item_flags & ITEM_CAN_PARRY)
/**
@@ -29,7 +29,7 @@
var/datum/block_parry_data/data
var/datum/tool
var/method
- if(using_item?.can_active_parry())
+ if(using_item?.can_active_parry(src))
data = using_item.block_parry_data
method = ITEM_PARRY
tool = using_item
@@ -50,9 +50,20 @@
using_item = backup
method = ITEM_PARRY
var/list/other_items = list()
- if(SEND_SIGNAL(src, COMSIG_LIVING_ACTIVE_PARRY_START, method, tool, other_items) & COMPONENT_PREVENT_PARRY_START)
+ var/list/override = list()
+ if(SEND_SIGNAL(src, COMSIG_LIVING_ACTIVE_PARRY_START, method, tool, other_items, override) & COMPONENT_PREVENT_PARRY_START)
to_chat(src, "Something is preventing you from parrying!")
return
+ if(length(override))
+ var/datum/thing = override[1]
+ var/_method = override[thing]
+ if(_method == ITEM_PARRY)
+ using_item = thing
+ method = ITEM_PARRY
+ data = using_item.block_parry_data
+ else if(_method == UNARMED_PARRY)
+ method = UNARMED_PARRY
+ data = thing
if(!using_item && !method && length(other_items))
using_item = other_items[1]
method = ITEM_PARRY
@@ -94,7 +105,7 @@
*/
/mob/living/proc/find_backup_parry_item()
for(var/obj/item/I in held_items - get_active_held_item())
- if(I.can_active_parry())
+ if(I.can_active_parry(src))
return I
/**
@@ -231,7 +242,7 @@
var/efficiency = data.get_parry_efficiency(attack_type, get_parry_time())
switch(parrying)
if(ITEM_PARRY)
- if(!active_parry_item.can_active_parry())
+ if(!active_parry_item.can_active_parry(src))
return BLOCK_NONE
. = active_parry_item.on_active_parry(src, object, damage, attack_text, attack_type, armour_penetration, attacker, def_zone, return_list, efficiency, get_parry_time())
if(UNARMED_PARRY)
@@ -243,6 +254,18 @@
if(efficiency <= 0) // Do not allow automatically handled/standardized parries that increase damage for now.
return
. |= BLOCK_SHOULD_PARTIAL_MITIGATE
+ if(efficiency >= data.parry_efficiency_perfect)
+ . |= data.perfect_parry_block_return_flags
+ if(data.perfect_parry_block_return_list)
+ return_list |= data.perfect_parry_block_return_list
+ else if(efficiency >= data.parry_efficiency_considered_successful)
+ . |= data.imperfect_parry_block_return_flags
+ if(data.imperfect_parry_block_return_list)
+ return_list |= data.imperfect_parry_block_return_list
+ else
+ . |= data.failed_parry_block_return_flags
+ if(data.failed_parry_block_return_list)
+ return_list |= data.failed_parry_block_return_list
if(isnull(return_list[BLOCK_RETURN_MITIGATION_PERCENT])) // if one of the on_active_parry procs overrode. We don't have to worry about interference since parries are the first thing checked in the [do_run_block()] sequence.
return_list[BLOCK_RETURN_MITIGATION_PERCENT] = clamp(efficiency, 0, 100) // do not allow > 100% or < 0% for now.
if((return_list[BLOCK_RETURN_MITIGATION_PERCENT] >= 100) || (damage <= 0))
diff --git a/code/modules/mob/living/living_blocking_parrying.dm b/code/modules/mob/living/living_blocking_parrying.dm
index e290956873..9e974177e5 100644
--- a/code/modules/mob/living/living_blocking_parrying.dm
+++ b/code/modules/mob/living/living_blocking_parrying.dm
@@ -157,6 +157,16 @@ GLOBAL_LIST_EMPTY(block_parry_data)
/// Parry cooldown post-parry if failed. This is ADDED to parry_cooldown!!!
var/parry_failed_cooldown_duration = 0 SECONDS
+ // Advanced
+ /// Flags added to return value
+ var/perfect_parry_block_return_flags = NONE
+ var/imperfect_parry_block_return_flags = NONE
+ var/failed_parry_block_return_flags = NONE
+ /// List appended to block return
+ var/perfect_parry_block_return_list
+ var/imperfect_parry_block_return_list
+ var/failed_parry_block_return_list
+
/**
* Quirky proc to get average of flags in list that are in attack_type because why is attack_type a flag.
*/
diff --git a/code/modules/mob/living/living_defines.dm b/code/modules/mob/living/living_defines.dm
index 742d4d8624..386f1174e1 100644
--- a/code/modules/mob/living/living_defines.dm
+++ b/code/modules/mob/living/living_defines.dm
@@ -81,7 +81,6 @@
var/bloodcrawl = 0 //0 No blood crawling, BLOODCRAWL for bloodcrawling, BLOODCRAWL_EAT for crawling+mob devour
var/holder = null //The holder for blood crawling
- var/ventcrawler = 0 //0 No vent crawling, 1 vent crawling in the nude, 2 vent crawling always
var/limb_destroyer = 0 //1 Sets AI behavior that allows mobs to target and dismember limbs with their basic attack.
var/mob_size = MOB_SIZE_HUMAN
diff --git a/code/modules/mob/living/living_sprint.dm b/code/modules/mob/living/living_sprint.dm
index 3ef67c9edd..728645c3eb 100644
--- a/code/modules/mob/living/living_sprint.dm
+++ b/code/modules/mob/living/living_sprint.dm
@@ -26,6 +26,8 @@
update_sprint_icon()
/mob/living/proc/enable_sprint_mode(update_icon = TRUE)
+ if(!CONFIG_GET(flag/sprint_enabled))
+ return
if(combat_flags & COMBAT_FLAG_SPRINT_ACTIVE)
return
ENABLE_BITFIELD(combat_flags, COMBAT_FLAG_SPRINT_ACTIVE)
@@ -61,6 +63,8 @@
update_sprint_icon()
/mob/living/proc/user_toggle_intentional_sprint_mode()
+ if(!CONFIG_GET(flag/sprint_enabled))
+ return
var/old = (combat_flags & COMBAT_FLAG_SPRINT_TOGGLED)
if(old)
if(combat_flags & COMBAT_FLAG_SPRINT_FORCED)
diff --git a/code/modules/mob/living/login.dm b/code/modules/mob/living/login.dm
index 931f87eb7c..2b1c2de17a 100644
--- a/code/modules/mob/living/login.dm
+++ b/code/modules/mob/living/login.dm
@@ -17,10 +17,6 @@
if (isturf(T))
update_z(T.z)
- //Vents
- if(ventcrawler)
- to_chat(src, "You can ventcrawl! Use alt+click on vents to quickly travel about the station.")
-
if(ranged_ability)
ranged_ability.add_ranged_ability(src, "You currently have [ranged_ability] active!")
if((vore_flags & VORE_INIT) && !(vore_flags & VOREPREF_INIT)) //Vore's been initialized, voreprefs haven't. If this triggers then that means that voreprefs failed to load due to the client being missing.
diff --git a/code/modules/mob/living/say.dm b/code/modules/mob/living/say.dm
index 4c03e74d70..606daed0c5 100644
--- a/code/modules/mob/living/say.dm
+++ b/code/modules/mob/living/say.dm
@@ -329,7 +329,7 @@ GLOBAL_LIST_INIT(department_radio_keys, list(
return 1
/mob/living/proc/can_speak_vocal(message) //Check AFTER handling of xeno and ling channels
- if(HAS_TRAIT(src, TRAIT_MUTE))
+ if(HAS_TRAIT(src, TRAIT_MUTE) && get_message_language(message) != /datum/language/signlanguage)
return 0
if(is_muzzled())
diff --git a/code/modules/mob/living/silicon/ai/ai.dm b/code/modules/mob/living/silicon/ai/ai.dm
index 823f759e67..e0e1d91ba9 100644
--- a/code/modules/mob/living/silicon/ai/ai.dm
+++ b/code/modules/mob/living/silicon/ai/ai.dm
@@ -1039,3 +1039,6 @@
if(current && eyeobj)
return eyeobj.emote(act, m_type, message, intentional, forced = TRUE)
return ..()
+
+/mob/living/silicon/ai/zMove(dir, feedback = FALSE)
+ . = eyeobj.zMove(dir, feedback)
diff --git a/code/modules/mob/living/silicon/ai/freelook/eye.dm b/code/modules/mob/living/silicon/ai/freelook/eye.dm
index 17de811cdd..dcaa28b39c 100644
--- a/code/modules/mob/living/silicon/ai/freelook/eye.dm
+++ b/code/modules/mob/living/silicon/ai/freelook/eye.dm
@@ -94,6 +94,25 @@
if(ai.master_multicam)
ai.master_multicam.refresh_view()
+//it uses setLoc not forceMove, talks to the sillycone and not the camera mob
+/mob/camera/aiEye/zMove(dir, feedback = FALSE)
+ if(dir != UP && dir != DOWN)
+ return FALSE
+ var/turf/target = get_step_multiz(src, dir)
+ if(!target)
+ if(feedback)
+ to_chat(ai, "There's nowhere to go in that direction!")
+ return FALSE
+ if(!canZMove(dir, target))
+ if(feedback)
+ to_chat(ai, "You couldn't move there!")
+ return FALSE
+ setLoc(target, TRUE)
+ return TRUE
+
+/mob/camera/aiEye/canZMove(direction, turf/target) //cameras do not respect these FLOORS you speak so much of
+ return TRUE
+
/mob/camera/aiEye/Move()
return 0
diff --git a/code/modules/mob/living/silicon/pai/pai.dm b/code/modules/mob/living/silicon/pai/pai.dm
index 2ab74664a3..4e33fba208 100644
--- a/code/modules/mob/living/silicon/pai/pai.dm
+++ b/code/modules/mob/living/silicon/pai/pai.dm
@@ -11,7 +11,7 @@
maxHealth = 500
layer = BELOW_MOB_LAYER
var/obj/item/instrument/piano_synth/internal_instrument
- silicon_privileges = PRIVILEDGES_PAI
+ silicon_privileges = PRIVILEGES_PAI
var/network = "ss13"
var/obj/machinery/camera/current = null
@@ -143,6 +143,10 @@
custom_holoform.Grant(src)
emitter_next_use = world.time + 10 SECONDS
+/mob/living/silicon/pai/deployed/Initialize()
+ . = ..()
+ fold_out(TRUE)
+
/mob/living/silicon/pai/ComponentInitialize()
. = ..()
if(possible_chassis[chassis])
diff --git a/code/modules/mob/living/silicon/robot/robot_modules.dm b/code/modules/mob/living/silicon/robot/robot_modules.dm
index 7c4125fbc6..4c83841809 100644
--- a/code/modules/mob/living/silicon/robot/robot_modules.dm
+++ b/code/modules/mob/living/silicon/robot/robot_modules.dm
@@ -923,7 +923,8 @@
/obj/item/cyborg_clamp,
/obj/item/stack/marker_beacon,
/obj/item/destTagger,
- /obj/item/stack/packageWrap)
+ /obj/item/stack/packageWrap,
+ /obj/item/card/id/miningborg)
emag_modules = list(/obj/item/borg/stun)
ratvar_modules = list(
/obj/item/clockwork/slab/cyborg/miner,
diff --git a/code/modules/mob/living/silicon/robot/robot_sprint.dm b/code/modules/mob/living/silicon/robot/robot_sprint.dm
index dff0d9dd0d..80adfe80fd 100644
--- a/code/modules/mob/living/silicon/robot/robot_sprint.dm
+++ b/code/modules/mob/living/silicon/robot/robot_sprint.dm
@@ -1,4 +1,7 @@
/mob/living/silicon/robot/default_toggle_sprint(shutdown = FALSE)
+ if(!CONFIG_GET(flag/sprint_enabled))
+ disable_intentional_sprint_mode()
+ return
var/current = (combat_flags & COMBAT_FLAG_SPRINT_ACTIVE)
if(current || shutdown || !cell || (cell.charge < 25) || !cansprint)
disable_intentional_sprint_mode()
diff --git a/code/modules/mob/living/silicon/silicon.dm b/code/modules/mob/living/silicon/silicon.dm
index 944b909463..b2b27c7d70 100644
--- a/code/modules/mob/living/silicon/silicon.dm
+++ b/code/modules/mob/living/silicon/silicon.dm
@@ -1,6 +1,6 @@
/mob/living/silicon
gender = NEUTER
- silicon_privileges = PRIVILEDGES_SILICON
+ silicon_privileges = PRIVILEGES_SILICON
verb_say = "states"
verb_ask = "queries"
verb_exclaim = "declares"
diff --git a/code/modules/mob/living/simple_animal/bot/bot.dm b/code/modules/mob/living/simple_animal/bot/bot.dm
index bb7c437ca7..d3838a580f 100644
--- a/code/modules/mob/living/simple_animal/bot/bot.dm
+++ b/code/modules/mob/living/simple_animal/bot/bot.dm
@@ -15,7 +15,7 @@
maxbodytemp = INFINITY
minbodytemp = 0
blood_volume = 0
- silicon_privileges = PRIVILEDGES_BOT
+ silicon_privileges = PRIVILEGES_BOT
sentience_type = SENTIENCE_ARTIFICIAL
status_flags = NONE //no default canpush
verb_say = "states"
diff --git a/code/modules/mob/living/simple_animal/bot/floorbot.dm b/code/modules/mob/living/simple_animal/bot/floorbot.dm
index 0ba4023864..47173f10ea 100644
--- a/code/modules/mob/living/simple_animal/bot/floorbot.dm
+++ b/code/modules/mob/living/simple_animal/bot/floorbot.dm
@@ -335,6 +335,12 @@
/mob/living/simple_animal/bot/floorbot/proc/repair(turf/target_turf)
+ if(check_bot_working(target_turf))
+ add_to_ignore(target_turf)
+ target = null
+ playsound(src, 'sound/effects/whistlereset.ogg', 50, TRUE)
+ return
+
if(isspaceturf(target_turf))
//Must be a hull breach or in line mode to continue.
if(!is_hull_breach(target_turf) && !targetdirection)
@@ -350,9 +356,9 @@
sleep(50)
if(mode == BOT_REPAIRING && src.loc == target_turf)
if(autotile) //Build the floor and include a tile.
- target_turf.PlaceOnTop(/turf/open/floor/plasteel, flags = CHANGETURF_INHERIT_AIR)
- else //Build a hull plating without a floor tile.
target_turf.PlaceOnTop(/turf/open/floor/plating, flags = CHANGETURF_INHERIT_AIR)
+ else //Build a hull plating without a floor tile.
+ target_turf.PlaceOnTop(/turf/open/floor/plasteel, flags = CHANGETURF_INHERIT_AIR)
else
var/turf/open/floor/F = target_turf
@@ -366,7 +372,7 @@
if(mode == BOT_REPAIRING && F && src.loc == F)
F.broken = 0
F.burnt = 0
- F.PlaceOnTop(/turf/open/floor/plasteel, flags = CHANGETURF_INHERIT_AIR)
+ F.PlaceOnTop(/turf/open/floor/plating, flags = CHANGETURF_INHERIT_AIR)
if(replacetiles && F.type != initial(tiletype.turf_type) && specialtiles && !isplatingturf(F))
anchored = TRUE
@@ -418,3 +424,14 @@
repair(A)
else
..()
+
+/**
+ * Checks a given turf to see if another floorbot is there, working as well.
+ */
+/mob/living/simple_animal/bot/floorbot/proc/check_bot_working(turf/active_turf)
+ if(isturf(active_turf))
+ for(var/mob/living/simple_animal/bot/floorbot/robot in active_turf)
+ if(robot.mode == BOT_REPAIRING)
+ return TRUE
+ return FALSE
+
diff --git a/code/modules/mob/living/simple_animal/friendly/bumbles.dm b/code/modules/mob/living/simple_animal/friendly/bumbles.dm
index 0debb7b98c..6ed6d03b68 100644
--- a/code/modules/mob/living/simple_animal/friendly/bumbles.dm
+++ b/code/modules/mob/living/simple_animal/friendly/bumbles.dm
@@ -20,7 +20,6 @@
density = FALSE
movement_type = FLYING
pass_flags = PASSTABLE | PASSGRILLE | PASSMOB
- ventcrawler = VENTCRAWLER_ALWAYS
mob_size = MOB_SIZE_TINY
mob_biotypes = MOB_ORGANIC|MOB_BEAST
gold_core_spawnable = FRIENDLY_SPAWN
@@ -35,6 +34,7 @@
/mob/living/simple_animal/pet/bumbles/Initialize()
. = ..()
add_verb(src, /mob/living/proc/lay_down)
+ AddElement(/datum/element/ventcrawling, given_tier = VENTCRAWLER_ALWAYS)
/mob/living/simple_animal/pet/bumbles/ComponentInitialize()
. = ..()
diff --git a/code/modules/mob/living/simple_animal/friendly/butterfly.dm b/code/modules/mob/living/simple_animal/friendly/butterfly.dm
index bf4f45e283..1e6afd6044 100644
--- a/code/modules/mob/living/simple_animal/friendly/butterfly.dm
+++ b/code/modules/mob/living/simple_animal/friendly/butterfly.dm
@@ -20,7 +20,6 @@
density = FALSE
movement_type = FLYING
pass_flags = PASSTABLE | PASSGRILLE | PASSMOB
- ventcrawler = VENTCRAWLER_ALWAYS
mob_size = MOB_SIZE_TINY
mob_biotypes = MOB_ORGANIC|MOB_BUG
gold_core_spawnable = FRIENDLY_SPAWN
@@ -33,6 +32,7 @@
. = ..()
var/newcolor = rgb(rand(0, 255), rand(0, 255), rand(0, 255))
add_atom_colour(newcolor, FIXED_COLOUR_PRIORITY)
+ AddElement(/datum/element/ventcrawling, given_tier = VENTCRAWLER_ALWAYS)
/mob/living/simple_animal/butterfly/bee_friendly()
return TRUE //treaty signed at the Beeneeva convention
diff --git a/code/modules/mob/living/simple_animal/friendly/cat.dm b/code/modules/mob/living/simple_animal/friendly/cat.dm
index 71ae3b4c03..4594d27ecd 100644
--- a/code/modules/mob/living/simple_animal/friendly/cat.dm
+++ b/code/modules/mob/living/simple_animal/friendly/cat.dm
@@ -14,7 +14,6 @@
speak_chance = 1
turns_per_move = 5
see_in_dark = 6
- ventcrawler = VENTCRAWLER_ALWAYS
pass_flags = PASSTABLE
mob_size = MOB_SIZE_SMALL
mob_biotypes = MOB_ORGANIC|MOB_BEAST
@@ -40,6 +39,7 @@
/mob/living/simple_animal/pet/cat/Initialize()
. = ..()
add_verb(src, /mob/living/proc/lay_down)
+ AddElement(/datum/element/ventcrawling, given_tier = VENTCRAWLER_ALWAYS)
/mob/living/simple_animal/pet/cat/ComponentInitialize()
. = ..()
diff --git a/code/modules/mob/living/simple_animal/friendly/cockroach.dm b/code/modules/mob/living/simple_animal/friendly/cockroach.dm
index f33c179911..f65b2bab9b 100644
--- a/code/modules/mob/living/simple_animal/friendly/cockroach.dm
+++ b/code/modules/mob/living/simple_animal/friendly/cockroach.dm
@@ -22,7 +22,6 @@
response_harm_simple = "splat"
speak_emote = list("chitters")
density = FALSE
- ventcrawler = VENTCRAWLER_ALWAYS
mob_size = MOB_SIZE_TINY
gold_core_spawnable = FRIENDLY_SPAWN
verb_say = "chitters"
@@ -32,6 +31,10 @@
var/squish_chance = 50
del_on_death = 1
+/mob/living/simple_animal/cockroach/Initialize()
+ . = ..()
+ AddElement(/datum/element/ventcrawling, given_tier = VENTCRAWLER_ALWAYS)
+
/mob/living/simple_animal/cockroach/death(gibbed)
if(SSticker.mode && SSticker.mode.station_was_nuked) //If the nuke is going off, then cockroaches are invincible. Keeps the nuke from killing them, cause cockroaches are immune to nukes.
return
diff --git a/code/modules/mob/living/simple_animal/friendly/crab.dm b/code/modules/mob/living/simple_animal/friendly/crab.dm
index 7f3693f622..addbd493a5 100644
--- a/code/modules/mob/living/simple_animal/friendly/crab.dm
+++ b/code/modules/mob/living/simple_animal/friendly/crab.dm
@@ -21,12 +21,15 @@
stop_automated_movement = 1
friendly_verb_continuous = "pinches"
friendly_verb_simple = "pinch"
- ventcrawler = VENTCRAWLER_ALWAYS
mob_size = MOB_SIZE_TINY
var/obj/item/inventory_head
var/obj/item/inventory_mask
gold_core_spawnable = FRIENDLY_SPAWN
+/mob/living/simple_animal/crab/Initialize()
+ . = ..()
+ AddElement(/datum/element/ventcrawling, given_tier = VENTCRAWLER_ALWAYS)
+
/mob/living/simple_animal/crab/BiologicalLife(seconds, times_fired)
if(!(. = ..()))
return
diff --git a/code/modules/mob/living/simple_animal/friendly/drone/_drone.dm b/code/modules/mob/living/simple_animal/friendly/drone/_drone.dm
index a8c0e7d207..ecd5db3ccf 100644
--- a/code/modules/mob/living/simple_animal/friendly/drone/_drone.dm
+++ b/code/modules/mob/living/simple_animal/friendly/drone/_drone.dm
@@ -28,7 +28,6 @@
unsuitable_atmos_damage = 0
wander = 0
speed = 0
- ventcrawler = VENTCRAWLER_ALWAYS
healable = 0
density = FALSE
pass_flags = PASSTABLE | PASSMOB
@@ -41,7 +40,7 @@
bubble_icon = "machine"
initial_language_holder = /datum/language_holder/drone
mob_size = MOB_SIZE_SMALL
- silicon_privileges = PRIVILEDGES_DRONE
+ silicon_privileges = PRIVILEGES_DRONE
damage_coeff = list(BRUTE = 1, BURN = 1, TOX = 0, CLONE = 0, STAMINA = 0, OXY = 0)
hud_possible = list(DIAG_STAT_HUD, DIAG_HUD, ANTAG_HUD)
unique_name = TRUE
@@ -101,6 +100,8 @@
for(var/datum/atom_hud/data/diagnostic/diag_hud in GLOB.huds)
diag_hud.add_to_hud(src)
+ AddElement(/datum/element/ventcrawling, given_tier = VENTCRAWLER_ALWAYS)
+
/mob/living/simple_animal/drone/ComponentInitialize()
. = ..()
if(can_be_held)
diff --git a/code/modules/mob/living/simple_animal/friendly/drone/extra_drone_types.dm b/code/modules/mob/living/simple_animal/friendly/drone/extra_drone_types.dm
index 55339a02fd..22dbdd3db7 100644
--- a/code/modules/mob/living/simple_animal/friendly/drone/extra_drone_types.dm
+++ b/code/modules/mob/living/simple_animal/friendly/drone/extra_drone_types.dm
@@ -114,7 +114,6 @@
harm_intent_damage = 5
density = TRUE
speed = 1
- ventcrawler = VENTCRAWLER_NONE
faction = list("neutral", "ratvar")
speak_emote = list("clanks", "clinks", "clunks", "clangs")
verb_ask = "requests"
diff --git a/code/modules/mob/living/simple_animal/friendly/drone/interaction.dm b/code/modules/mob/living/simple_animal/friendly/drone/interaction.dm
index 54184310a8..11d7884999 100644
--- a/code/modules/mob/living/simple_animal/friendly/drone/interaction.dm
+++ b/code/modules/mob/living/simple_animal/friendly/drone/interaction.dm
@@ -110,7 +110,7 @@
to_chat(src, "Your onboard antivirus has initiated lockdown. Motor servos are impaired, ventilation access is denied, and your display reports that you are hacked to all nearby.")
hacked = TRUE
mind.special_role = "hacked drone"
- ventcrawler = VENTCRAWLER_NONE //Again, balance
+ RemoveElement(/datum/element/ventcrawling, given_tier = VENTCRAWLER_ALWAYS) // balance
speed = 1 //gotta go slow
message_admins("[src] ([src.key]) became a hacked drone hellbent on [clockwork ? "serving Ratvar" : "destroying the station"]!")
else
@@ -125,7 +125,7 @@
to_chat(src, "Having been restored, your onboard antivirus reports the all-clear and you are able to perform all actions again.")
hacked = FALSE
mind.special_role = null
- ventcrawler = initial(ventcrawler)
+ AddElement(/datum/element/ventcrawling, given_tier = VENTCRAWLER_ALWAYS)
speed = initial(speed)
if(is_servant_of_ratvar(src))
remove_servant_of_ratvar(src, TRUE)
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 51e7ee6c03..81925d922f 100644
--- a/code/modules/mob/living/simple_animal/friendly/farm_animals.dm
+++ b/code/modules/mob/living/simple_animal/friendly/farm_animals.dm
@@ -241,7 +241,6 @@
attack_verb_simple = "kick"
health = 3
maxHealth = 3
- ventcrawler = VENTCRAWLER_ALWAYS
var/amount_grown = 0
pass_flags = PASSTABLE | PASSGRILLE | PASSMOB
mob_size = MOB_SIZE_TINY
@@ -253,6 +252,7 @@
. = ..()
pixel_x = rand(-6, 6)
pixel_y = rand(0, 10)
+ AddElement(/datum/element/ventcrawling, given_tier = VENTCRAWLER_ALWAYS)
/mob/living/simple_animal/chick/BiologicalLife(seconds, times_fired)
if(!(. = ..()))
@@ -296,7 +296,6 @@
attack_verb_simple = "kick"
health = 15
maxHealth = 15
- ventcrawler = VENTCRAWLER_ALWAYS
var/eggsleft = 0
var/eggsFertile = TRUE
var/body_color
@@ -322,6 +321,8 @@
pixel_y = rand(0, 10)
++chicken_count
+ AddElement(/datum/element/ventcrawling, given_tier = VENTCRAWLER_ALWAYS)
+
/mob/living/simple_animal/chicken/Destroy()
--chicken_count
return ..()
@@ -392,7 +393,6 @@
attack_verb_simple = "kick"
health = 25
maxHealth = 25
- ventcrawler = VENTCRAWLER_ALWAYS
var/eggsleft = 0
var/eggsFertile = TRUE
pass_flags = PASSTABLE | PASSMOB
@@ -412,6 +412,8 @@
. = ..()
++kiwi_count
+ AddElement(/datum/element/ventcrawling, given_tier = VENTCRAWLER_ALWAYS)
+
/mob/living/simple_animal/kiwi/BiologicalLife(seconds, times_fired)
if(!(. = ..()))
return
@@ -473,7 +475,6 @@
attack_verb_simple = "kick"
health = 10
maxHealth = 10
- ventcrawler = VENTCRAWLER_ALWAYS
var/amount_grown = 0
pass_flags = PASSTABLE | PASSGRILLE | PASSMOB
mob_size = MOB_SIZE_TINY
@@ -486,6 +487,8 @@
pixel_x = rand(-6, 6)
pixel_y = rand(0, 10)
+ AddElement(/datum/element/ventcrawling, given_tier = VENTCRAWLER_ALWAYS)
+
/mob/living/simple_animal/babyKiwi/BiologicalLife(seconds, times_fired)
if(!(. = ..()))
return
diff --git a/code/modules/mob/living/simple_animal/friendly/lizard.dm b/code/modules/mob/living/simple_animal/friendly/lizard.dm
index b9ff99b677..fd0095bf87 100644
--- a/code/modules/mob/living/simple_animal/friendly/lizard.dm
+++ b/code/modules/mob/living/simple_animal/friendly/lizard.dm
@@ -18,7 +18,6 @@
response_disarm_simple = "shoo"
response_harm_continuous = "stomps on"
response_harm_simple = "stomp on"
- ventcrawler = VENTCRAWLER_ALWAYS
density = FALSE
pass_flags = PASSTABLE | PASSMOB
mob_size = MOB_SIZE_SMALL
@@ -31,6 +30,7 @@
/mob/living/simple_animal/hostile/lizard/ComponentInitialize()
. = ..()
AddElement(/datum/element/mob_holder, worn_state = "lizard", inv_slots = ITEM_SLOT_HEAD) //you can hold lizards now.
+ AddElement(/datum/element/ventcrawling, given_tier = VENTCRAWLER_ALWAYS)
/mob/living/simple_animal/hostile/lizard/CanAttack(atom/the_target)//Can we actually attack a possible target?
if(see_invisible < the_target.invisibility)//Target's invisible to us, forget it
diff --git a/code/modules/mob/living/simple_animal/friendly/mouse.dm b/code/modules/mob/living/simple_animal/friendly/mouse.dm
index 51c903ee16..8348af43fa 100644
--- a/code/modules/mob/living/simple_animal/friendly/mouse.dm
+++ b/code/modules/mob/living/simple_animal/friendly/mouse.dm
@@ -22,7 +22,6 @@
response_harm_continuous = "splats"
response_harm_simple = "splat"
density = FALSE
- ventcrawler = VENTCRAWLER_ALWAYS
pass_flags = PASSTABLE | PASSGRILLE | PASSMOB
mob_size = MOB_SIZE_TINY
mob_biotypes = MOB_ORGANIC|MOB_BEAST
@@ -40,6 +39,7 @@
icon_state = "mouse_[body_color]"
icon_living = "mouse_[body_color]"
icon_dead = "mouse_[body_color]_dead"
+ AddElement(/datum/element/ventcrawling, given_tier = VENTCRAWLER_ALWAYS)
/mob/living/simple_animal/mouse/proc/splat()
src.health = 0
diff --git a/code/modules/mob/living/simple_animal/friendly/possum.dm b/code/modules/mob/living/simple_animal/friendly/possum.dm
index 71fdbd1465..5e7ed572e2 100644
--- a/code/modules/mob/living/simple_animal/friendly/possum.dm
+++ b/code/modules/mob/living/simple_animal/friendly/possum.dm
@@ -22,12 +22,15 @@
response_harm_continuous = "stamps on"
response_harm_simple = "stamp"
density = FALSE
- ventcrawler = VENTCRAWLER_ALWAYS
pass_flags = PASSTABLE | PASSMOB
mob_size = MOB_SIZE_TINY
mob_biotypes = MOB_ORGANIC|MOB_BEAST
gold_core_spawnable = FRIENDLY_SPAWN
+/mob/living/simple_animal/opossum/Initialize()
+ . = ..()
+ AddElement(/datum/element/ventcrawling, given_tier = VENTCRAWLER_ALWAYS)
+
/mob/living/simple_animal/opossum/poppy
name = "Poppy the Safety Possum"
desc = "Safety first!"
diff --git a/code/modules/mob/living/simple_animal/friendly/snake.dm b/code/modules/mob/living/simple_animal/friendly/snake.dm
index 4d20b927a6..61c735c7c1 100644
--- a/code/modules/mob/living/simple_animal/friendly/snake.dm
+++ b/code/modules/mob/living/simple_animal/friendly/snake.dm
@@ -30,7 +30,6 @@
response_harm_continuous = "steps on"
response_harm_simple = "step on"
faction = list("hostile")
- ventcrawler = VENTCRAWLER_ALWAYS
density = FALSE
pass_flags = PASSTABLE | PASSMOB
mob_size = MOB_SIZE_SMALL
@@ -39,6 +38,9 @@
obj_damage = 0
environment_smash = ENVIRONMENT_SMASH_NONE
+/mob/living/simple_animal/hostile/retaliate/poison/snake/Initialize()
+ . = ..()
+ AddElement(/datum/element/ventcrawling, given_tier = VENTCRAWLER_ALWAYS)
/mob/living/simple_animal/hostile/retaliate/poison/snake/ListTargets(atom/the_target)
. = oview(vision_range, targets_from) //get list of things in vision range
diff --git a/code/modules/mob/living/simple_animal/hostile/banana_spider.dm b/code/modules/mob/living/simple_animal/hostile/banana_spider.dm
index 259c0bc721..a88593ed74 100644
--- a/code/modules/mob/living/simple_animal/hostile/banana_spider.dm
+++ b/code/modules/mob/living/simple_animal/hostile/banana_spider.dm
@@ -22,7 +22,6 @@
speak_emote = list("chitters")
mouse_opacity = 2
density = TRUE
- ventcrawler = VENTCRAWLER_ALWAYS
verb_say = "chitters"
verb_ask = "chitters inquisitively"
verb_exclaim = "chitters loudly"
@@ -37,6 +36,8 @@
if(A)
notify_ghosts("A banana spider has been created in \the [A.name].", source = src, action=NOTIFY_ATTACK, flashwindow = FALSE, ignore_dnr_observers = TRUE)
+ AddElement(/datum/element/ventcrawling, given_tier = VENTCRAWLER_ALWAYS)
+
/mob/living/simple_animal/banana_spider/attack_ghost(mob/user)
if(key) //please stop using src. without a good reason.
return
diff --git a/code/modules/mob/living/simple_animal/hostile/bear.dm b/code/modules/mob/living/simple_animal/hostile/bear.dm
index 1be90a07f8..c7772f780d 100644
--- a/code/modules/mob/living/simple_animal/hostile/bear.dm
+++ b/code/modules/mob/living/simple_animal/hostile/bear.dm
@@ -109,7 +109,7 @@
to_chat(user, "You strap the armor plating to [A] and sharpen [A.p_their()] claws with the nail filer. This was a great idea.")
qdel(src)
-mob/living/simple_animal/hostile/bear/butter //The mighty companion to Cak. Several functions used from it.
+/mob/living/simple_animal/hostile/bear/butter //The mighty companion to Cak. Several functions used from it.
name = "Terrygold"
icon_state = "butterbear"
icon_living = "butterbear"
@@ -155,7 +155,7 @@ mob/living/simple_animal/hostile/bear/butter //The mighty companion to Cak. Seve
to_chat(src, "Your name is now \"new_name\"!")
name = new_name
-mob/living/simple_animal/hostile/bear/butter/AttackingTarget() //Makes some attacks by the butter bear slip those who dare cross its path.
+/mob/living/simple_animal/hostile/bear/butter/AttackingTarget() //Makes some attacks by the butter bear slip those who dare cross its path.
if(isliving(target))
var/mob/living/L = target
if((L.mobility_flags & MOBILITY_STAND))
diff --git a/code/modules/mob/living/simple_animal/hostile/bread.dm b/code/modules/mob/living/simple_animal/hostile/bread.dm
index 317827028d..70c8b0c540 100644
--- a/code/modules/mob/living/simple_animal/hostile/bread.dm
+++ b/code/modules/mob/living/simple_animal/hostile/bread.dm
@@ -26,7 +26,6 @@
speak_emote = list("growls")
mouse_opacity = 2
density = TRUE
- ventcrawler = VENTCRAWLER_ALWAYS
verb_say = "growls"
verb_ask = "growls inquisitively"
verb_exclaim = "growls loudly"
@@ -38,6 +37,7 @@
var/area/A = get_area(src)
if(A)
notify_ghosts("A tumor bread has been created in \the [A.name].", source = src, action=NOTIFY_ATTACK, flashwindow = FALSE, ignore_dnr_observers = TRUE)
+ AddElement(/datum/element/ventcrawling, given_tier = VENTCRAWLER_ALWAYS)
/mob/living/simple_animal/hostile/bread/attack_ghost(mob/user)
if(key) //please stop using src. without a good reason.
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 bde5a19518..2349685a4e 100644
--- a/code/modules/mob/living/simple_animal/hostile/giant_spider.dm
+++ b/code/modules/mob/living/simple_animal/hostile/giant_spider.dm
@@ -44,7 +44,6 @@
var/busy = SPIDER_IDLE
pass_flags = PASSTABLE
move_to_delay = 6
- ventcrawler = VENTCRAWLER_ALWAYS
attack_verb_continuous = "bites"
attack_verb_simple = "bite"
attack_sound = 'sound/weapons/bite.ogg'
@@ -63,6 +62,8 @@
lay_web = new
lay_web.Grant(src)
+ AddElement(/datum/element/ventcrawling, given_tier = VENTCRAWLER_ALWAYS)
+
/mob/living/simple_animal/hostile/poison/giant_spider/Destroy()
QDEL_NULL(lay_web)
return ..()
@@ -389,7 +390,6 @@
name = "Wrap"
panel = "Spider"
active = FALSE
- datum/action/spell_action/action = null
desc = "Wrap something or someone in a cocoon. If it's a living being, you'll also consume them, allowing you to lay eggs."
ranged_mousepointer = 'icons/effects/wrap_target.dmi'
action_icon = 'icons/mob/actions/actions_animal.dmi'
diff --git a/code/modules/mob/living/simple_animal/hostile/headcrab.dm b/code/modules/mob/living/simple_animal/hostile/headcrab.dm
index 850beeb099..5e34d17bb2 100644
--- a/code/modules/mob/living/simple_animal/hostile/headcrab.dm
+++ b/code/modules/mob/living/simple_animal/hostile/headcrab.dm
@@ -20,11 +20,14 @@
obj_damage = 0
environment_smash = ENVIRONMENT_SMASH_NONE
speak_emote = list("squeaks")
- ventcrawler = VENTCRAWLER_ALWAYS
var/datum/mind/origin
var/egg_lain = 0
gold_core_spawnable = NO_SPAWN //are you sure about this?? // CITADEL CHANGE, Yes.
+/mob/living/simple_animal/hostile/headcrab/Initialize()
+ . = ..()
+ AddElement(/datum/element/ventcrawling, given_tier = VENTCRAWLER_ALWAYS)
+
/mob/living/simple_animal/hostile/headcrab/proc/Infect(mob/living/carbon/victim)
var/obj/item/organ/body_egg/changeling_egg/egg = new(victim)
egg.Insert(victim)
diff --git a/code/modules/mob/living/simple_animal/hostile/hostile.dm b/code/modules/mob/living/simple_animal/hostile/hostile.dm
index 37eb9b7f67..95f8f2acc1 100644
--- a/code/modules/mob/living/simple_animal/hostile/hostile.dm
+++ b/code/modules/mob/living/simple_animal/hostile/hostile.dm
@@ -511,7 +511,7 @@
DestroyObjectsInDirection(direction)
-mob/living/simple_animal/hostile/proc/DestroySurroundings() // for use with megafauna destroying everything around them
+/mob/living/simple_animal/hostile/proc/DestroySurroundings() // for use with megafauna destroying everything around them
if(environment_smash)
EscapeConfinement()
for(var/dir in GLOB.cardinals)
diff --git a/code/modules/mob/living/simple_animal/hostile/killertomato.dm b/code/modules/mob/living/simple_animal/hostile/killertomato.dm
index b86d5d87fc..d3d3dadd1e 100644
--- a/code/modules/mob/living/simple_animal/hostile/killertomato.dm
+++ b/code/modules/mob/living/simple_animal/hostile/killertomato.dm
@@ -22,10 +22,13 @@
attack_verb_continuous = "slams"
attack_verb_simple = "slam"
attack_sound = 'sound/weapons/punch1.ogg'
- ventcrawler = VENTCRAWLER_ALWAYS
faction = list("plants")
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
+
+/mob/living/simple_animal/hostile/killertomato/Initialize()
+ . = ..()
+ AddElement(/datum/element/ventcrawling, given_tier = VENTCRAWLER_ALWAYS)
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 fa3a59a6b9..a584d34995 100644
--- a/code/modules/mob/living/simple_animal/hostile/megafauna/colossus.dm
+++ b/code/modules/mob/living/simple_animal/hostile/megafauna/colossus.dm
@@ -620,7 +620,6 @@ Difficulty: Very Hard
density = FALSE
movement_type = FLYING
pass_flags = PASSTABLE | PASSGRILLE | PASSMOB
- ventcrawler = VENTCRAWLER_ALWAYS
mob_size = MOB_SIZE_TINY
gold_core_spawnable = HOSTILE_SPAWN
verb_say = "warps"
@@ -648,6 +647,7 @@ Difficulty: Very Hard
remove_verb(src, /mob/verb/me_verb)
var/datum/atom_hud/medsensor = GLOB.huds[DATA_HUD_MEDICAL_ADVANCED]
medsensor.add_hud_to(src)
+ AddElement(/datum/element/ventcrawling, given_tier = VENTCRAWLER_ALWAYS)
/mob/living/simple_animal/hostile/lightgeist/AttackingTarget()
. = ..()
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 0ccc4525c7..e35220a920 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
@@ -27,7 +27,6 @@
friendly_verb_continuous = "pinches"
friendly_verb_simple = "pinch"
a_intent = INTENT_HELP
- ventcrawler = VENTCRAWLER_ALWAYS
gold_core_spawnable = FRIENDLY_SPAWN
stat_attack = UNCONSCIOUS
gender = NEUTER
@@ -50,6 +49,7 @@
/mob/living/simple_animal/hostile/asteroid/gutlunch/Initialize()
udder = new()
. = ..()
+ AddElement(/datum/element/ventcrawling, given_tier = VENTCRAWLER_ALWAYS)
/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
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 11ce4f9214..ae0f5ea3ca 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
@@ -398,7 +398,6 @@
uniform = /obj/item/clothing/under/color/grey
belt = /obj/item/tank/internals/emergency_oxygen
mask = /obj/item/clothing/mask/gas
- ears = /obj/item/radio/headset
gloves = /obj/item/clothing/gloves/color/fyellow
id = /obj/item/card/id/silver/reaper //looks cool and has a fancy name but only a 1% chance
if(prob(99))
@@ -412,7 +411,7 @@
back = /obj/item/spear
else if(prob(80)) //Now they dont always have a backpack
back = /obj/item/storage/backpack
- backpack_contents = list(/obj/item/stack/cable_coil = 1, /obj/item/assembly/flash = 1, /obj/item/storage/fancy/donut_box = 1, /obj/item/storage/fancy/cigarettes/cigpack_shadyjims = 1, /obj/item/lighter = 1)
+ backpack_contents = list(/obj/item/stack/cable_coil = 1, /obj/item/storage/fancy/donut_box = 1, /obj/item/storage/fancy/cigarettes/cigpack_shadyjims = 1, /obj/item/lighter = 1)
if(prob(90))
r_pocket = /obj/item/kitchen/knife
if(prob(60))
@@ -423,7 +422,6 @@
suit = /obj/item/clothing/suit/hooded/bee_costume
shoes = /obj/item/clothing/shoes/sneakers/yellow
gloves = /obj/item/clothing/gloves/color/yellow
- ears = /obj/item/radio/headset
belt = /obj/item/storage/belt/fannypack/yellow
id_job = "Assisant"
id = /obj/item/card/id
diff --git a/code/modules/mob/living/simple_animal/hostile/mushroom.dm b/code/modules/mob/living/simple_animal/hostile/mushroom.dm
index 9101430ccc..f41746ea69 100644
--- a/code/modules/mob/living/simple_animal/hostile/mushroom.dm
+++ b/code/modules/mob/living/simple_animal/hostile/mushroom.dm
@@ -28,7 +28,6 @@
stat_attack = DEAD
mouse_opacity = MOUSE_OPACITY_ICON
speed = 1
- ventcrawler = VENTCRAWLER_ALWAYS
robust_searching = 1
unique_name = 1
speak_emote = list("squeaks")
@@ -41,6 +40,10 @@
var/static/mutable_appearance/cap_living //Where we store our cap icons so we dont generate them constantly to update our icon
var/static/mutable_appearance/cap_dead
+/mob/living/simple_animal/hostile/mushroom/Initialize()
+ . = ..()
+ AddElement(/datum/element/ventcrawling, given_tier = VENTCRAWLER_ALWAYS)
+
/mob/living/simple_animal/hostile/mushroom/examine(mob/user)
. = ..()
if(health >= maxHealth)
diff --git a/code/modules/mob/living/simple_animal/hostile/regalrat.dm b/code/modules/mob/living/simple_animal/hostile/regalrat.dm
index 77b2d4268a..77731f0ea4 100644
--- a/code/modules/mob/living/simple_animal/hostile/regalrat.dm
+++ b/code/modules/mob/living/simple_animal/hostile/regalrat.dm
@@ -23,7 +23,6 @@
attack_verb_continuous = "slashes"
attack_verb_simple = "slash"
attack_sound = 'sound/weapons/punch1.ogg'
- ventcrawler = VENTCRAWLER_ALWAYS
unique_name = TRUE
faction = list("rat")
var/datum/action/cooldown/coffer
@@ -42,6 +41,8 @@
key = C.key
notify_ghosts("All rise for the rat king, ascendant to the throne in \the [get_area(src)].", source = src, action = NOTIFY_ORBIT, flashwindow = FALSE)
+ AddElement(/datum/element/ventcrawling, given_tier = VENTCRAWLER_ALWAYS)
+
/mob/living/simple_animal/hostile/regalrat/handle_automated_action()
if(prob(20))
riot.Trigger()
@@ -175,7 +176,6 @@
health = 15
butcher_results = list(/obj/item/reagent_containers/food/snacks/meat/slab = 1)
density = FALSE
- ventcrawler = VENTCRAWLER_ALWAYS
pass_flags = PASSTABLE | PASSGRILLE | PASSMOB
mob_size = MOB_SIZE_TINY
mob_biotypes = MOB_ORGANIC|MOB_BEAST
@@ -185,6 +185,7 @@
. = ..()
SSmobs.cheeserats += src
AddComponent(/datum/component/swarming)
+ AddElement(/datum/element/ventcrawling, given_tier = VENTCRAWLER_ALWAYS)
/mob/living/simple_animal/hostile/rat/Destroy()
SSmobs.cheeserats -= src
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 9045ccef51..cb1ee6c6f6 100644
--- a/code/modules/mob/living/simple_animal/hostile/retaliate/bat.dm
+++ b/code/modules/mob/living/simple_animal/hostile/retaliate/bat.dm
@@ -30,7 +30,6 @@
attack_sound = 'sound/weapons/bite.ogg'
obj_damage = 0
environment_smash = ENVIRONMENT_SMASH_NONE
- ventcrawler = VENTCRAWLER_ALWAYS
mob_size = MOB_SIZE_TINY
movement_type = FLYING
speak_emote = list("squeaks")
@@ -38,11 +37,14 @@
var/min_oxy = 0
var/max_tox = 0
-
//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)
minbodytemp = 0
+/mob/living/simple_animal/hostile/retaliate/bat/Initialize()
+ . = ..()
+ AddElement(/datum/element/ventcrawling, given_tier = VENTCRAWLER_ALWAYS)
+
/mob/living/simple_animal/hostile/retaliate/bat/secbat
name = "Security Bat"
icon_state = "secbat"
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 dec2159dc0..96418686d3 100644
--- a/code/modules/mob/living/simple_animal/hostile/retaliate/clown.dm
+++ b/code/modules/mob/living/simple_animal/hostile/retaliate/clown.dm
@@ -137,7 +137,6 @@
emote_see = list("honks", "sweats", "jiggles", "contemplates its existence")
speak_chance = 5
dextrous = TRUE
- ventcrawler = VENTCRAWLER_ALWAYS
maxHealth = 140
health = 140
speed = -5
@@ -147,6 +146,10 @@
obj_damage = 5
loot = list(/obj/item/clothing/suit/hooded/bloated_human, /obj/item/clothing/mask/gas/clown_hat, /obj/effect/gibspawner/human, /obj/item/soap)
+/mob/living/simple_animal/hostile/retaliate/clown/fleshclown/Initialize()
+ . = ..()
+ AddElement(/datum/element/ventcrawling, given_tier = VENTCRAWLER_ALWAYS)
+
/mob/living/simple_animal/hostile/retaliate/clown/longface
name = "Longface"
desc = "Often found walking into the bar."
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 f0fe85008a..2433b45cc0 100644
--- a/code/modules/mob/living/simple_animal/hostile/retaliate/frog.dm
+++ b/code/modules/mob/living/simple_animal/hostile/retaliate/frog.dm
@@ -22,7 +22,6 @@
response_harm_continuous = "splats"
response_harm_simple = "splat"
density = FALSE
- ventcrawler = VENTCRAWLER_ALWAYS
faction = list("hostile")
attack_sound = 'sound/effects/reee.ogg'
butcher_results = list(/obj/item/reagent_containers/food/snacks/nugget = 1)
@@ -40,6 +39,7 @@
icon_living = "rare_frog"
icon_dead = "rare_frog_dead"
butcher_results = list(/obj/item/reagent_containers/food/snacks/nugget = 5)
+ AddElement(/datum/element/ventcrawling, given_tier = VENTCRAWLER_ALWAYS)
/mob/living/simple_animal/hostile/retaliate/frog/Crossed(AM as mob|obj)
. = ..()
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 fdb088934c..cc5b0b8a75 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
@@ -190,5 +190,5 @@
* Arguments:
* * datum/beam/vine - The vine to be removed from the list.
*/
-mob/living/simple_animal/hostile/venus_human_trap/proc/remove_vine(datum/beam/vine, force)
+/mob/living/simple_animal/hostile/venus_human_trap/proc/remove_vine(datum/beam/vine, force)
vines -= vine
diff --git a/code/modules/mob/living/simple_animal/parrot.dm b/code/modules/mob/living/simple_animal/parrot.dm
index 06e336875a..d146bb855f 100644
--- a/code/modules/mob/living/simple_animal/parrot.dm
+++ b/code/modules/mob/living/simple_animal/parrot.dm
@@ -83,6 +83,8 @@
//Headset for Poly to yell at engineers :)
var/obj/item/radio/headset/ears = null
+ /// spawns with headset
+ var/spawns_with_headset = FALSE
//The thing the parrot is currently interested in. This gets used for items the parrot wants to pick up, mobs it wants to steal from,
//mobs it wants to attack or mobs that have attacked it
@@ -105,13 +107,14 @@
/mob/living/simple_animal/parrot/Initialize()
. = ..()
- if(!ears)
- var/headset = pick(/obj/item/radio/headset/headset_sec, \
- /obj/item/radio/headset/headset_eng, \
- /obj/item/radio/headset/headset_med, \
- /obj/item/radio/headset/headset_sci, \
- /obj/item/radio/headset/headset_cargo)
- ears = new headset(src)
+ if(spawns_with_headset)
+ if(!ears)
+ var/headset = pick(/obj/item/radio/headset/headset_sec, \
+ /obj/item/radio/headset/headset_eng, \
+ /obj/item/radio/headset/headset_med, \
+ /obj/item/radio/headset/headset_sci, \
+ /obj/item/radio/headset/headset_cargo)
+ ears = new headset(src)
parrot_sleep_dur = parrot_sleep_max //In case someone decides to change the max without changing the duration var
@@ -881,6 +884,7 @@
speak = list("Poly 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
+ spawns_with_headset = TRUE
var/memory_saved = FALSE
var/rounds_survived = 0
var/longest_survival = 0
diff --git a/code/modules/mob/living/simple_animal/slime/slime.dm b/code/modules/mob/living/simple_animal/slime/slime.dm
index ab59441572..06649ac7d6 100644
--- a/code/modules/mob/living/simple_animal/slime/slime.dm
+++ b/code/modules/mob/living/simple_animal/slime/slime.dm
@@ -4,7 +4,6 @@
icon_state = "grey baby slime"
pass_flags = PASSTABLE
mob_size = MOB_SIZE_SMALL
- ventcrawler = VENTCRAWLER_ALWAYS
gender = NEUTER
var/is_adult = 0
var/docile = 0
@@ -108,6 +107,8 @@
AddComponent(/datum/component/footstep, FOOTSTEP_MOB_SLIME, 7.5)
set_nutrition(rand(650, 800))
+ AddElement(/datum/element/ventcrawling, given_tier = VENTCRAWLER_ALWAYS)
+
/mob/living/simple_animal/slime/Destroy()
for (var/A in actions)
var/datum/action/AC = A
diff --git a/code/modules/mob/living/ventcrawling.dm b/code/modules/mob/living/ventcrawling.dm
index 4c00fd0033..9ade9f097f 100644
--- a/code/modules/mob/living/ventcrawling.dm
+++ b/code/modules/mob/living/ventcrawling.dm
@@ -5,7 +5,7 @@ GLOBAL_LIST_INIT(ventcrawl_machinery, typecacheof(list(
//VENTCRAWLING
-/mob/living/proc/handle_ventcrawl(atom/A)
+/mob/living/proc/handle_ventcrawl(atom/A, ventcrawler)
if(!ventcrawler || !Adjacent(A))
return
. = TRUE //return value to stop the client from being shown the turf contents stat tab on alt-click.
@@ -59,7 +59,7 @@ GLOBAL_LIST_INIT(ventcrawl_machinery, typecacheof(list(
if(!client)
return
- if(iscarbon(src) && ventcrawler == VENTCRAWLER_NUDE)
+ if(iscarbon(src) && ventcrawler==VENTCRAWLER_NUDE)
if(length(get_equipped_items(include_pockets = TRUE)) || get_num_held_items())
to_chat(src, "You can't crawl around in the ventilation ducts with items!")
return
diff --git a/code/modules/mob/mob_helpers.dm b/code/modules/mob/mob_helpers.dm
index 605f0a2d55..4b0f505067 100644
--- a/code/modules/mob/mob_helpers.dm
+++ b/code/modules/mob/mob_helpers.dm
@@ -408,7 +408,7 @@ It's fairly easy to fix if dealing with single letters but not so much with comp
return
return TRUE
-/atom/proc/hasSiliconAccessInArea(mob/user, flags = PRIVILEDGES_SILICON)
+/atom/proc/hasSiliconAccessInArea(mob/user, flags = PRIVILEGES_SILICON)
return user.silicon_privileges & (flags) || (user.siliconaccesstoggle && (get_area(src) in user.siliconaccessareas))
/mob/proc/toggleSiliconAccessArea(area/area)
@@ -496,7 +496,7 @@ It's fairly easy to fix if dealing with single letters but not so much with comp
colored_message = "[message]"
else
colored_message = "[message]"
-
+
//This makes readability a bit better for admins.
switch(message_type)
if(LOG_WHISPER)
@@ -507,7 +507,7 @@ It's fairly easy to fix if dealing with single letters but not so much with comp
colored_message = "(ASAY) [colored_message]"
if(LOG_EMOTE)
colored_message = "(EMOTE) [colored_message]"
-
+
var/list/timestamped_message = list("\[[TIME_STAMP("hh:mm:ss", FALSE)]\] [key_name(src)] [loc_name(src)] (Event #[LAZYLEN(logging[smessage_type])])" = colored_message)
logging[smessage_type] += timestamped_message
diff --git a/code/modules/mob/say_vr.dm b/code/modules/mob/say_vr.dm
index c5c53dc876..94bf45c1b0 100644
--- a/code/modules/mob/say_vr.dm
+++ b/code/modules/mob/say_vr.dm
@@ -3,14 +3,14 @@
//////////////////////////////////////////////////////
/mob/proc/get_top_level_mob()
- if(istype(src.loc,/mob)&&src.loc!=src)
- var/mob/M=src.loc
+ if(ismob(src.loc) && src.loc != src)
+ var/mob/M = src.loc
return M.get_top_level_mob()
return src
-proc/get_top_level_mob(var/mob/S)
- if(istype(S.loc,/mob)&&S.loc!=S)
- var/mob/M=S.loc
+/proc/get_top_level_mob(mob/S)
+ if(ismob(S.loc) && S.loc != S)
+ var/mob/M = S.loc
return M.get_top_level_mob()
return S
diff --git a/code/modules/mob/transform_procs.dm b/code/modules/mob/transform_procs.dm
index 3a7e270567..e49bd5162b 100644
--- a/code/modules/mob/transform_procs.dm
+++ b/code/modules/mob/transform_procs.dm
@@ -175,6 +175,7 @@
icon = null
cut_overlays()
invisibility = INVISIBILITY_MAXIMUM
+
new /obj/effect/temp_visual/monkeyify/humanify(loc)
transformation_timer = addtimer(CALLBACK(src, .proc/finish_humanize, tr_flags), TRANSFORMATION_DURATION, TIMER_UNIQUE)
@@ -202,6 +203,8 @@
var/mob/living/carbon/human/O = new( loc )
for(var/obj/item/C in O.loc)
+ if(C.anchored)
+ continue
O.equip_to_appropriate_slot(C)
dna.transfer_identity(O)
diff --git a/code/modules/modular_computers/file_system/programs/card.dm b/code/modules/modular_computers/file_system/programs/card.dm
index 6d45914add..3455547d20 100644
--- a/code/modules/modular_computers/file_system/programs/card.dm
+++ b/code/modules/modular_computers/file_system/programs/card.dm
@@ -175,7 +175,7 @@
if("PRG_edit")
if(!computer || !authenticated || !target_id_card)
return
- var/new_name = params["name"]
+ var/new_name = reject_bad_name(params["name"])
if(!new_name)
return
target_id_card.registered_name = new_name
@@ -190,7 +190,7 @@
return
if(target == "Custom")
- var/custom_name = params["custom_name"]
+ var/custom_name = reject_bad_name(params["custom_name"])
if(custom_name)
target_id_card.assignment = custom_name
target_id_card.update_label()
diff --git a/code/modules/movespeed/modifiers/reagents.dm b/code/modules/movespeed/modifiers/reagents.dm
index b6c2458670..1a03e8a602 100644
--- a/code/modules/movespeed/modifiers/reagents.dm
+++ b/code/modules/movespeed/modifiers/reagents.dm
@@ -12,3 +12,7 @@
/datum/movespeed_modifier/reagent/nitryl
multiplicative_slowdown = -1
+
+/datum/movespeed_modifier/reagent/meth
+ multiplicative_slowdown = -0.5
+ absolute_max_tiles_per_second = 11
diff --git a/code/modules/paperwork/paper.dm b/code/modules/paperwork/paper.dm
index 20ec678e45..a00145f9dc 100644
--- a/code/modules/paperwork/paper.dm
+++ b/code/modules/paperwork/paper.dm
@@ -193,6 +193,13 @@
user.visible_message(ignition_message)
add_fingerprint(user)
fire_act(I.get_temperature())
+//I would have it become a paper plane before the throw, but that would risk runtimes
+/obj/item/paper/DoRevenantThrowEffects(atom/target)
+ sleep(10)
+ if(HAS_TRAIT(src, TRAIT_SPOOKY_THROW))
+ return
+ new /obj/item/paperplane(get_turf(src))
+ qdel(src)
/obj/item/paper/attackby(obj/item/P, mob/living/user, params)
if(burn_paper_product_attackby_check(P, user))
diff --git a/code/modules/pool/pool_controller.dm b/code/modules/pool/pool_controller.dm
index 17faa7a3e3..9f670de282 100644
--- a/code/modules/pool/pool_controller.dm
+++ b/code/modules/pool/pool_controller.dm
@@ -146,7 +146,7 @@
return
reagents.clear_reagents()
// This also reacts them. No nitroglycerin deathpools, sorry gamers :(
- W.reagents.trans_to(reagents, max_beaker_transfer)
+ W.reagents.trans_to(reagents, max_beaker_transfer, log = "pool fill from reagent container")
user.visible_message("[src] makes a slurping noise.", "All of the contents of [W] are quickly suctioned out by the machine! R.pH) && (pH <= 7)) || ((pH < R.pH) && (pH >= 7)))
pH = (((pH - R.pH) / total_volume) * amount) + pH
if(istype(my_atom, /obj/item/reagent_containers/))
@@ -987,6 +985,8 @@
amount = clamp(amount, 0, R.volume)
R.volume -= amount
update_total()
+ if(total_volume <= 0)//Because this can result in 0, I don't want it to crash.
+ pH = REAGENT_NORMAL_PH
if(!safety)//So it does not handle reactions when it need not to
handle_reactions()
if(my_atom)
diff --git a/code/modules/reagents/chemistry/machinery/chem_dispenser.dm b/code/modules/reagents/chemistry/machinery/chem_dispenser.dm
index d1c18f0510..22aadc06f4 100644
--- a/code/modules/reagents/chemistry/machinery/chem_dispenser.dm
+++ b/code/modules/reagents/chemistry/machinery/chem_dispenser.dm
@@ -24,9 +24,11 @@
circuit = /obj/item/circuitboard/machine/chem_dispenser
var/obj/item/stock_parts/cell/cell
var/powerefficiency = 0.0666666
+ var/dispenceUnit = 5
var/amount = 30
var/recharge_amount = 10
var/recharge_counter = 0
+ var/canStore = TRUE//If this can hold reagents or not
var/mutable_appearance/beaker_overlay
var/working_state = "dispenser_working"
var/nopower_state = "dispenser_nopower"
@@ -102,6 +104,7 @@
if(upgrade_reagents3)
upgrade_reagents3 = sortList(upgrade_reagents3, /proc/cmp_reagents_asc)
dispensable_reagents = sortList(dispensable_reagents, /proc/cmp_reagents_asc)
+ create_reagents(200, NO_REACT)
update_icon()
/obj/machinery/chem_dispenser/Destroy()
@@ -190,24 +193,27 @@
data["amount"] = amount
data["energy"] = cell.charge ? cell.charge * powerefficiency : "0" //To prevent NaN in the UI.
data["maxEnergy"] = cell.maxcharge * powerefficiency
+ data["storedVol"] = reagents.total_volume
+ data["maxVol"] = reagents.maximum_volume
data["isBeakerLoaded"] = beaker ? 1 : 0
+ data["stepAmount"] = dispenceUnit
+ data["canStore"] = canStore
var/beakerContents[0]
var/beakerCurrentVolume = 0
if(beaker && beaker.reagents && beaker.reagents.reagent_list.len)
for(var/datum/reagent/R in beaker.reagents.reagent_list)
- beakerContents.Add(list(list("name" = R.name, "volume" = R.volume))) // list in a list because Byond merges the first list...
+ beakerContents.Add(list(list("name" = R.name, "id" = R.type, "volume" = round(R.volume, 0.01)))) // list in a list because Byond merges the first list...
beakerCurrentVolume += R.volume
data["beakerContents"] = beakerContents
if (beaker)
- data["beakerCurrentVolume"] = beakerCurrentVolume
+ data["beakerCurrentVolume"] = round(beakerCurrentVolume, 0.01)
data["beakerMaxVolume"] = beaker.volume
data["beakerTransferAmounts"] = beaker.possible_transfer_amounts
- data["beakerCurrentpH"] = beaker.reagents.pH
//pH accuracy
for(var/obj/item/stock_parts/capacitor/C in component_parts)
- data["partRating"]= 10**(C.rating-1)
+ data["beakerCurrentpH"] = round(beaker.reagents.pH, 10**-(C.rating+1))
else
data["beakerCurrentVolume"] = null
@@ -225,11 +231,17 @@
var/chemname = temp.name
if(is_hallucinating && prob(5))
chemname = "[pick_list_replacements("hallucination.json", "chemicals")]"
- chemicals.Add(list(list("title" = chemname, "id" = ckey(temp.name))))
+ chemicals.Add(list(list("title" = chemname, "id" = ckey(temp.name), "pH" = temp.pH, "pHCol" = ConvertpHToCol(temp.pH))))
data["chemicals"] = chemicals
data["recipes"] = saved_recipes
data["recordingRecipe"] = recording_recipe
+
+ var/storedContents[0]
+ if(reagents.total_volume)
+ for(var/datum/reagent/N in reagents.reagent_list)
+ storedContents.Add(list(list("name" = N.name, "id" = N.type, "volume" = N.volume)))
+ data["storedContents"] = storedContents
return data
/obj/machinery/chem_dispenser/ui_act(action, params)
@@ -240,10 +252,9 @@
if(!is_operational() || QDELETED(beaker))
return
var/target = text2num(params["target"])
- if(target in beaker.possible_transfer_amounts)
- amount = target
- work_animation()
- . = TRUE
+ SetAmount(target)
+ work_animation()
+ . = TRUE
if("dispense")
if(!is_operational() || QDELETED(cell))
return
@@ -269,10 +280,9 @@
if(!is_operational() || recording_recipe)
return
var/amount = text2num(params["amount"])
- if(beaker && (amount in beaker.possible_transfer_amounts))
- beaker.reagents.remove_all(amount)
- work_animation()
- . = TRUE
+ beaker.reagents.remove_all(amount) //This should be set correctly in "amount"
+ work_animation()
+ . = TRUE
if("eject")
replace_beaker(usr)
. = TRUE
@@ -350,6 +360,52 @@
recording_recipe = null
. = TRUE
+ //Storing and unstoring reagents
+ if("store")
+ if(!is_operational() || QDELETED(cell))
+ return
+ if(!beaker)
+ return
+ if(recording_recipe)
+ say("Cannot store while recording!")
+ return
+ if(beaker.reagents.fermiIsReacting)
+ say("Cannot store ongoing reactions!")
+ return
+ var/reagent = text2path(params["id"])
+ var/datum/reagent/R = beaker.reagents.has_reagent(reagent)
+ var/potentialAmount = min(amount, R.volume)
+ if(reagents.total_volume+potentialAmount > reagents.maximum_volume)
+ say("Not enough storage space left!")
+ return
+ beaker.reagents.trans_id_to(src, R.type, potentialAmount)
+ work_animation()
+ . = TRUE
+
+ if("unstore")
+ if(!is_operational() || QDELETED(cell))
+ return
+ if(!beaker)
+ return
+ if(recording_recipe)
+ say("Cannot distribute while recording!")
+ return
+ var/reagent = text2path(params["id"])
+ var/datum/reagent/R = reagents.has_reagent(reagent)
+ reagents.trans_id_to(beaker, R.type, amount)
+ work_animation()
+ . = TRUE
+
+/obj/machinery/chem_dispenser/proc/SetAmount(inputAmount)
+ if(inputAmount % 5 == 0) //Always allow 5u values
+ amount = inputAmount
+ return
+ inputAmount -= inputAmount % dispenceUnit
+ if(inputAmount == 0) //Prevent ghost entries in macros
+ amount = dispenceUnit
+ return
+ amount = inputAmount
+
/obj/machinery/chem_dispenser/attackby(obj/item/I, mob/user, params)
if(default_unfasten_wrench(user, I))
return
@@ -402,6 +458,8 @@
cell = P
for(var/obj/item/stock_parts/matter_bin/M in component_parts)
newpowereff += 0.0166666666*M.rating
+ if(reagents)
+ reagents.maximum_volume = 200*(M.rating)
for(var/obj/item/stock_parts/capacitor/C in component_parts)
recharge_amount *= C.rating
for(var/obj/item/stock_parts/manipulator/M in component_parts)
@@ -411,6 +469,15 @@
dispensable_reagents |= upgrade_reagents2
if(M.rating > 3)
dispensable_reagents |= upgrade_reagents3
+ switch(M.rating)
+ if(-INFINITY to 1)
+ dispenceUnit = 5
+ if(2)
+ dispenceUnit = 3
+ if(3)
+ dispenceUnit = 2
+ if(4 to INFINITY)
+ dispenceUnit = 1
powerefficiency = round(newpowereff, 0.01)
/obj/machinery/chem_dispenser/proc/replace_beaker(mob/living/user, obj/item/reagent_containers/new_beaker)
@@ -421,6 +488,8 @@
user.put_in_hands(B)
if(new_beaker)
beaker = new_beaker
+ if(amount > beaker.reagents.maximum_volume)
+ amount = beaker.reagents.maximum_volume
else
beaker = null
update_icon()
@@ -439,6 +508,32 @@
replace_beaker(user)
return TRUE
+/obj/machinery/chem_dispenser/proc/ConvertpHToCol(pH)
+ switch(pH)
+ if(-INFINITY to 1)
+ return "red"
+ if(1 to 2)
+ return "orange"
+ if(2 to 3)
+ return "average"
+ if(3 to 4)
+ return "yellow"
+ if(4 to 5)
+ return "olive"
+ if(5 to 6)
+ return "good"
+ if(6 to 8)
+ return "green"
+ if(8 to 9.5)
+ return "teal"
+ if(9.5 to 11)
+ return "blue"
+ if(11 to 12.5)
+ return "violet"
+ if(12.5 to INFINITY)
+ return "purple"
+
+
/obj/machinery/chem_dispenser/drinks/Initialize()
. = ..()
AddComponent(/datum/component/simple_rotation, ROTATION_ALTCLICK | ROTATION_CLOCKWISE)
@@ -466,6 +561,7 @@
b_o.pixel_x = rand(-9, 9)
return b_o
+
/obj/machinery/chem_dispenser/drinks
name = "soda dispenser"
desc = "Contains a large reservoir of soft drinks."
@@ -479,6 +575,7 @@
working_state = null
nopower_state = null
pass_flags = PASSTABLE
+ canStore = FALSE
dispensable_reagents = list(
/datum/reagent/water,
/datum/reagent/consumable/ice,
@@ -611,12 +708,14 @@
dispensable_reagents = list(/datum/reagent/toxin/mutagen)
upgrade_reagents = null
emagged_reagents = list(/datum/reagent/toxin/plasma)
+ canStore = FALSE
/obj/machinery/chem_dispenser/mutagensaltpeter
name = "botanical chemical dispenser"
desc = "Creates and dispenses chemicals useful for botany."
flags_1 = NODECONSTRUCT_1
+ canStore = FALSE
dispensable_reagents = list(
/datum/reagent/toxin/mutagen,
@@ -739,6 +838,7 @@
working_state = "minidispenser_working"
nopower_state = "minidispenser_nopower"
circuit = /obj/item/circuitboard/machine/chem_dispenser/apothecary
+ canStore = FALSE
powerefficiency = 0.0833333
dispensable_reagents = list( //radium and stable plasma moved to upgrade tier 1 and 2, they've little to do with most medicines anyway.
/datum/reagent/hydrogen,
diff --git a/code/modules/reagents/chemistry/machinery/chem_heater.dm b/code/modules/reagents/chemistry/machinery/chem_heater.dm
index 8c3b9c7f99..cd8ee2d986 100644
--- a/code/modules/reagents/chemistry/machinery/chem_heater.dm
+++ b/code/modules/reagents/chemistry/machinery/chem_heater.dm
@@ -126,7 +126,7 @@
var beakerContents[0]
if(beaker)
for(var/datum/reagent/R in beaker.reagents.reagent_list)
- beakerContents.Add(list(list("name" = R.name, "volume" = R.volume, "purity" = R.purity))) // list in a list because Byond merges the first list...
+ beakerContents.Add(list(list("name" = R.name, "volume" = round(R.volume, 0.01), "purity" = round(R.purity, 0.01)))) // list in a list because Byond merges the first list...
data["beakerContents"] = beakerContents
return data
diff --git a/code/modules/reagents/chemistry/machinery/chem_master.dm b/code/modules/reagents/chemistry/machinery/chem_master.dm
index 89fdb52b2a..285ef70433 100644
--- a/code/modules/reagents/chemistry/machinery/chem_master.dm
+++ b/code/modules/reagents/chemistry/machinery/chem_master.dm
@@ -184,13 +184,13 @@
var/beakerContents[0]
if(beaker)
for(var/datum/reagent/R in beaker.reagents.reagent_list)
- beakerContents.Add(list(list("name" = R.name, "id" = ckey(R.name), "volume" = R.volume))) // list in a list because Byond merges the first list...
+ beakerContents.Add(list(list("name" = R.name, "id" = R.type, "volume" = R.volume))) // list in a list because Byond merges the first list...
data["beakerContents"] = beakerContents
var/bufferContents[0]
if(reagents.total_volume)
for(var/datum/reagent/N in reagents.reagent_list)
- bufferContents.Add(list(list("name" = N.name, "id" = ckey(N.name), "volume" = N.volume))) // ^
+ bufferContents.Add(list(list("name" = N.name, "id" = N.type, "volume" = N.volume))) // ^
data["bufferContents"] = bufferContents
//Calculated at init time as it never changes
@@ -216,7 +216,7 @@
if(action == "transfer")
if(!beaker)
return FALSE
- var/reagent = GLOB.name2reagent[params["id"]]
+ var/reagent = text2path(params["id"])
var/amount = text2num(params["amount"])
var/to_container = params["to"]
// Custom amount
@@ -386,7 +386,7 @@
if(action == "analyze")
// var/datum/reagent/R = GLOB.name2reagent[params["id"]]
- var/reagent = GLOB.name2reagent[params["id"]]
+ var/reagent = text2path(params["id"])
var/datum/reagent/R = GLOB.chemical_reagents_list[reagent]
if(R)
var/state = "Unknown"
@@ -405,7 +405,7 @@
analyzeVars = list("name" = initial(R.name), "state" = state, "color" = initial(R.color), "description" = initial(R.description), "metaRate" = T, "overD" = initial(R.overdose_threshold), "addicD" = initial(R.addiction_threshold), "purityF" = R.purity, "inverseRatioF" = initial(R.inverse_chem_val), "purityE" = initial(Rcr.PurityMin), "minTemp" = initial(Rcr.OptimalTempMin), "maxTemp" = initial(Rcr.OptimalTempMax), "eTemp" = initial(Rcr.ExplodeTemp), "pHpeak" = pHpeakCache)
else
fermianalyze = FALSE
- analyzeVars = list("name" = initial(R.name), "state" = state, "color" = initial(R.color), "description" = initial(R.description), "metaRate" = T, "overD" = initial(R.overdose_threshold), "addicD" = initial(R.addiction_threshold))
+ analyzeVars = list("name" = initial(R.name), "state" = state, "color" = initial(R.color), "description" = initial(R.description), "metaRate" = T, "overD" = initial(R.overdose_threshold), "addicD" = initial(R.addiction_threshold), "purityF" = R.purity)
screen = "analyze"
return TRUE
diff --git a/code/modules/reagents/chemistry/reagents/alcohol_reagents.dm b/code/modules/reagents/chemistry/reagents/alcohol_reagents.dm
index a0de9f7a7f..aae21464b1 100644
--- a/code/modules/reagents/chemistry/reagents/alcohol_reagents.dm
+++ b/code/modules/reagents/chemistry/reagents/alcohol_reagents.dm
@@ -2288,6 +2288,7 @@ All effects don't start immediately, but rather get worse over time; the rate is
//Race-Base-Drinks//
////////////////////
/datum/reagent/consumable/ethanol/species_drink
+ name = "Species Drink"
var/species_required
var/disgust = 26
boozepwr = 50
diff --git a/code/modules/reagents/chemistry/reagents/drink_reagents.dm b/code/modules/reagents/chemistry/reagents/drink_reagents.dm
index 1a8f6edcbe..f4f5b90398 100644
--- a/code/modules/reagents/chemistry/reagents/drink_reagents.dm
+++ b/code/modules/reagents/chemistry/reagents/drink_reagents.dm
@@ -504,6 +504,14 @@
glass_desc = "Don't cry, Don't raise your eye, It's only nuclear wasteland."
value = REAGENT_VALUE_COMMON
+/datum/reagent/consumable/nuka_cola/on_mob_metabolize(mob/living/carbon/M)
+ M.add_movespeed_modifier(/datum/movespeed_modifier/reagent/meth)
+ return ..()
+
+/datum/reagent/consumable/nuka_cola/on_mob_end_metabolize(mob/living/carbon/M)
+ M.remove_movespeed_modifier(/datum/movespeed_modifier/reagent/meth)
+ return ..()
+
/datum/reagent/consumable/nuka_cola/on_mob_life(mob/living/carbon/M)
M.Jitter(20)
M.set_drugginess(30)
@@ -608,7 +616,7 @@
name = "Buzz Fuzz"
description = "~A Hive of Flavour!~ NOTICE: Addicting."
nutriment_factor = 0
- addiction_threshold = 26 //A can and a sip
+ addiction_threshold = 31 //A can and a sip
color = "#8CFF00" // rgb: 135, 255, 0
taste_description = "carbonated honey and pollen"
glass_icon_state = "buzz_fuzz"
diff --git a/code/modules/reagents/chemistry/reagents/drug_reagents.dm b/code/modules/reagents/chemistry/reagents/drug_reagents.dm
index 0b44c33926..675502c5fb 100644
--- a/code/modules/reagents/chemistry/reagents/drug_reagents.dm
+++ b/code/modules/reagents/chemistry/reagents/drug_reagents.dm
@@ -174,11 +174,13 @@
ADD_TRAIT(L, TRAIT_IGNOREDAMAGESLOWDOWN, type)
L.update_movespeed()
ADD_TRAIT(L, TRAIT_TASED_RESISTANCE, type)
+ L.add_movespeed_modifier(/datum/movespeed_modifier/reagent/meth)
/datum/reagent/drug/methamphetamine/on_mob_end_metabolize(mob/living/L)
REMOVE_TRAIT(L, TRAIT_IGNOREDAMAGESLOWDOWN, type)
L.update_movespeed()
REMOVE_TRAIT(L, TRAIT_TASED_RESISTANCE, type)
+ L.remove_movespeed_modifier(/datum/movespeed_modifier/reagent/meth)
..()
/datum/reagent/drug/methamphetamine/on_mob_life(mob/living/carbon/M)
diff --git a/code/modules/reagents/chemistry/reagents/medicine_reagents.dm b/code/modules/reagents/chemistry/reagents/medicine_reagents.dm
index 7ab50884e0..e55286ed3f 100644
--- a/code/modules/reagents/chemistry/reagents/medicine_reagents.dm
+++ b/code/modules/reagents/chemistry/reagents/medicine_reagents.dm
@@ -272,10 +272,10 @@
overdose_threshold = 50
/datum/reagent/medicine/silver_sulfadiazine/reaction_obj(obj/O, reac_volume)
- if(istype(O, /obj/item/stack/medical/gauze))
+ if(istype(O, /obj/item/stack/medical/gauze/adv))
var/obj/item/stack/medical/gauze/G = O
- reac_volume = min((reac_volume / 10), G.amount)
- new/obj/item/stack/medical/mesh(get_turf(G), reac_volume)
+ reac_volume = min((reac_volume / 5), G.amount)
+ new /obj/item/stack/medical/mesh/five(get_turf(G), reac_volume)
G.use(reac_volume)
/datum/reagent/medicine/silver_sulfadiazine/reaction_mob(mob/living/M, method=TOUCH, reac_volume, show_message = 1)
@@ -358,10 +358,10 @@
..()
/datum/reagent/medicine/styptic_powder/reaction_obj(obj/O, reac_volume)
- if(istype(O, /obj/item/stack/medical/gauze))
+ if(istype(O, /obj/item/stack/medical/gauze/adv))
var/obj/item/stack/medical/gauze/G = O
- reac_volume = min((reac_volume / 10), G.amount)
- new/obj/item/stack/medical/suture(get_turf(G), reac_volume)
+ reac_volume = min((reac_volume / 5), G.amount)
+ new /obj/item/stack/medical/suture/five(get_turf(G), reac_volume)
G.use(reac_volume)
/datum/reagent/medicine/styptic_powder/on_mob_life(mob/living/carbon/M)
diff --git a/code/modules/reagents/chemistry/reagents/other_reagents.dm b/code/modules/reagents/chemistry/reagents/other_reagents.dm
index 17cde0611b..ba7f9a30d5 100644
--- a/code/modules/reagents/chemistry/reagents/other_reagents.dm
+++ b/code/modules/reagents/chemistry/reagents/other_reagents.dm
@@ -2528,7 +2528,7 @@
M.adjustStaminaLoss(-0.25*REM) // the more wounds, the more stamina regen
..()
-datum/reagent/eldritch
+/datum/reagent/eldritch
name = "Eldritch Essence"
description = "Strange liquid that defies the laws of physics"
taste_description = "Ag'hsj'saje'sh"
@@ -2663,3 +2663,32 @@ datum/reagent/eldritch
M.SetSleeping(0, 0)
..()
+//Nerdy card reagents
+
+/datum/reagent/card_powder
+ var/rarity = "Stoopid"
+
+/datum/reagent/card_powder/blue
+ name = "Blue Card Powder"
+ rarity = "Rare"
+ color = "#00B7EF" // blue
+
+/datum/reagent/card_powder/purple
+ name = "Purple Card Powder"
+ rarity = "Epic"
+ color = "#DA00FF" // purple
+
+/datum/reagent/card_powder/yellow
+ name = "Yellow Crayon Powder"
+ rarity = "Legendary"
+ color = "#FFF200" // yellow
+
+/datum/reagent/card_powder/green
+ name = "Green Crayon Powder"
+ rarity = "Common"
+ color = "#A8E61D" // green
+
+/datum/reagent/card_powder/black
+ name = "Black Crayon Powder"
+ rarity = "Exodia"
+ color = "#1C1C1C" // not quite black
diff --git a/code/modules/reagents/chemistry/reagents/toxin_reagents.dm b/code/modules/reagents/chemistry/reagents/toxin_reagents.dm
index 0d0a234afc..c9fbf6928a 100644
--- a/code/modules/reagents/chemistry/reagents/toxin_reagents.dm
+++ b/code/modules/reagents/chemistry/reagents/toxin_reagents.dm
@@ -783,6 +783,8 @@
value = REAGENT_VALUE_VERY_RARE
/datum/reagent/toxin/rotatium/on_mob_life(mob/living/carbon/M)
+ return ..() // until fixed - the rotations never stop
+/*
if(M.hud_used)
if(current_cycle >= 20 && current_cycle%20 == 0)
var/list/screens = list(M.hud_used.plane_masters["[FLOOR_PLANE]"], M.hud_used.plane_masters["[GAME_PLANE]"],
@@ -800,6 +802,7 @@
for(var/whole_screen in screens)
animate(whole_screen, transform = matrix(), time = 5, easing = QUAD_EASING)
..()
+*/
/datum/reagent/toxin/skewium
name = "Skewium"
diff --git a/code/modules/reagents/chemistry/recipes/medicine.dm b/code/modules/reagents/chemistry/recipes/medicine.dm
index d4d66af240..f2e9bd9e1a 100644
--- a/code/modules/reagents/chemistry/recipes/medicine.dm
+++ b/code/modules/reagents/chemistry/recipes/medicine.dm
@@ -116,7 +116,10 @@
holder.remove_reagent(id, added_volume*temp_ratio)
if(St.purity < 1)
St.volume *= St.purity
+ added_volume *= St.purity
St.purity = 1
+ if(!N)
+ return
var/amount = clamp(0.002, 0, N.volume)
N.volume -= amount
St.data["grown_volume"] = St.data["grown_volume"] + added_volume
diff --git a/code/modules/reagents/chemistry/recipes/others.dm b/code/modules/reagents/chemistry/recipes/others.dm
index 019394e3c8..93a422e2f2 100644
--- a/code/modules/reagents/chemistry/recipes/others.dm
+++ b/code/modules/reagents/chemistry/recipes/others.dm
@@ -881,3 +881,29 @@
results = list(/datum/reagent/carbon = 1)
required_reagents = list(/datum/reagent/cellulose = 1)
required_temp = 512
+
+//Nerdy card shit
+
+/datum/chemical_reaction/card_powder/blue
+ name = "Blue Card Powder"
+ id = /datum/reagent/card_powder/blue
+ results = list(/datum/reagent/card_powder/blue = 1)
+ required_reagents = list(/datum/reagent/card_powder/green = 12)
+
+/datum/chemical_reaction/card_powder/purple
+ name = "Purple Card Powder"
+ id = /datum/reagent/card_powder/purple
+ results = list(/datum/reagent/card_powder/purple = 1)
+ required_reagents = list(/datum/reagent/card_powder/blue = 12)
+
+/datum/chemical_reaction/card_powder/yellow
+ name = "Yellow Card Powder"
+ id = /datum/reagent/card_powder/yellow
+ results = list(/datum/reagent/card_powder/yellow = 1)
+ required_reagents = list(/datum/reagent/card_powder/purple = 12)
+
+/datum/chemical_reaction/card_powder/black
+ name = "Black Card Powder"
+ id = /datum/reagent/card_powder/black
+ results = list(/datum/reagent/card_powder/black = 1)
+ required_reagents = list(/datum/reagent/card_powder/yellow = 12)
diff --git a/code/modules/reagents/reagent_containers/blood_pack.dm b/code/modules/reagents/reagent_containers/blood_pack.dm
index 98a117ea69..acfda85963 100644
--- a/code/modules/reagents/reagent_containers/blood_pack.dm
+++ b/code/modules/reagents/reagent_containers/blood_pack.dm
@@ -104,31 +104,44 @@
return ..()
/obj/item/reagent_containers/blood/attack(mob/living/carbon/C, mob/user, def_zone)
- if(user.a_intent == INTENT_HELP && reagents.total_volume > 0 && iscarbon(C) && user.a_intent == INTENT_HELP)
- if(C.is_mouth_covered())
- to_chat(user, "You cant drink from the [src] while your mouth is covered.")
- return
- if(user != C)
- user.visible_message("[user] forces [C] to drink from the [src].", \
- "You force [C] to drink from the [src]")
- if(!do_mob(user, C, 50))
- return
- else
- if(!do_mob(user, C, 10))
- return
+ if(!iscarbon(C) || user.a_intent != INTENT_HELP || reagents.total_volume <= 0)
+ ..()
- to_chat(user, "You take a sip from the [src].")
- user.visible_message("[user] puts the [src] up to their mouth.")
- if(reagents.total_volume <= 0) // Safety: In case you spam clicked the blood bag on yourself, and it is now empty (below will divide by zero)
+ if(C.is_mouth_covered())
+ if(user != C)
+ to_chat(user, "You can't force [C] to drink from [src] while their mouth is covered.")
return
- var/gulp_size = 3
- var/fraction = min(gulp_size / reagents.total_volume, 1)
- reagents.reaction(C, INGEST, fraction) //checkLiked(fraction, M) // Blood isn't food, sorry.
- reagents.trans_to(C, gulp_size)
- reagents.remove_reagent(src, 2) //Inneficency, so hey, IVs are usefull.
- playsound(C.loc,'sound/items/drink.ogg', rand(10, 50), TRUE)
+ to_chat(user, "You can't drink from [src] while your mouth is covered.")
return
- ..()
+
+ if(!user.CheckActionCooldown())
+ return
+ if(user != C)
+ user.visible_message("[user] forces [C] to drink from [src].", \
+ "You force [C] to drink from [src]")
+ user.DelayNextAction(50)
+ if(do_mob(user, C, 50))
+ do_drink(C, user)
+
+ else
+ user.DelayNextAction(10)
+ if(do_mob(user, C, 10))
+ user.visible_message("[user] puts [src] up to their mouth.", \
+ "You take a sip from [src].")
+ do_drink(C, user)
+
+
+/obj/item/reagent_containers/blood/proc/do_drink(mob/living/carbon/C, mob/user)
+ if(reagents.total_volume <= 0) // Safety: In case you spam clicked the blood bag on yourself, and it is now empty (below will divide by zero)
+ to_chat(user, "...and notice [src] is empty.")
+ return
+ var/gulp_size = 3
+ var/fraction = min(gulp_size / reagents.total_volume, 1)
+ reagents.reaction(C, INGEST, fraction) //checkLiked(fraction, M) // Blood isn't food, sorry.
+ reagents.remove_any(5) //Inneficency, so hey, IVs are usefull.
+ reagents.trans_to(C, gulp_size)
+ playsound(C.loc,'sound/items/drink.ogg', rand(10, 50), TRUE)
+
/obj/item/reagent_containers/blood/bluespace
name = "bluespace blood pack"
diff --git a/code/modules/reagents/reagent_containers/chem_pack.dm b/code/modules/reagents/reagent_containers/chem_pack.dm
index 78ae1a3070..77d6067d3b 100644
--- a/code/modules/reagents/reagent_containers/chem_pack.dm
+++ b/code/modules/reagents/reagent_containers/chem_pack.dm
@@ -44,8 +44,7 @@
else
. += "Alt-click to seal it."
-
-obj/item/reagent_containers/chem_pack/attack_self(mob/user)
+/obj/item/reagent_containers/chem_pack/attack_self(mob/user)
if(sealed)
return
..()
diff --git a/code/modules/reagents/reagent_containers/dropper.dm b/code/modules/reagents/reagent_containers/dropper.dm
index 3ed946d0c5..bad9417dc8 100644
--- a/code/modules/reagents/reagent_containers/dropper.dm
+++ b/code/modules/reagents/reagent_containers/dropper.dm
@@ -48,7 +48,7 @@
safe_thing.create_reagents(100, NONE, NO_REAGENTS_VALUE)
reagents.reaction(safe_thing, TOUCH, fraction)
- trans = reagents.trans_to(safe_thing, amount_per_transfer_from_this)
+ trans = reagents.trans_to(safe_thing, amount_per_transfer_from_this, log = "failed squirt")
target.visible_message("[user] tries to squirt something into [target]'s eyes, but fails!", \
"[user] tries to squirt something into [target]'s eyes, but fails!")
@@ -67,7 +67,7 @@
var/mob/M = target
log_combat(user, M, "squirted", reagents.log_list())
- trans = src.reagents.trans_to(target, amount_per_transfer_from_this)
+ trans = src.reagents.trans_to(target, amount_per_transfer_from_this, log = "dropper drop")
to_chat(user, "You transfer [trans] unit\s of the solution.")
update_icon()
@@ -81,7 +81,7 @@
to_chat(user, "[target] is empty!")
return
- var/trans = target.reagents.trans_to(src, amount_per_transfer_from_this)
+ var/trans = target.reagents.trans_to(src, amount_per_transfer_from_this, log = "dropper fill")
to_chat(user, "You fill [src] with [trans] unit\s of the solution.")
diff --git a/code/modules/reagents/reagent_containers/hypospray.dm b/code/modules/reagents/reagent_containers/hypospray.dm
index 1f89af420e..143025aed1 100644
--- a/code/modules/reagents/reagent_containers/hypospray.dm
+++ b/code/modules/reagents/reagent_containers/hypospray.dm
@@ -41,7 +41,7 @@
if(M.reagents)
var/trans = 0
if(!infinite)
- trans = reagents.trans_to(M, amount_per_transfer_from_this, log = TRUE)
+ trans = reagents.trans_to(M, amount_per_transfer_from_this, log = "hypospray injection")
else
trans = reagents.copy_to(M, amount_per_transfer_from_this)
@@ -427,7 +427,7 @@
var/fraction = min(vial.amount_per_transfer_from_this/vial.reagents.total_volume, 1)
vial.reagents.reaction(L, method, fraction)
- vial.reagents.trans_to(target, vial.amount_per_transfer_from_this, log = TRUE)
+ vial.reagents.trans_to(target, vial.amount_per_transfer_from_this, log = "hypospray fill")
var/long_sound = vial.amount_per_transfer_from_this >= 15
playsound(loc, long_sound ? 'sound/items/hypospray_long.ogg' : pick('sound/items/hypospray.ogg','sound/items/hypospray2.ogg'), 50, 1, -1)
to_chat(user, "You [fp_verb] [vial.amount_per_transfer_from_this] units of the solution. The hypospray's cartridge now contains [vial.reagents.total_volume] units.")
diff --git a/code/modules/reagents/reagent_containers/rags.dm b/code/modules/reagents/reagent_containers/rags.dm
index 5d94e78809..8a6e2bf2e7 100644
--- a/code/modules/reagents/reagent_containers/rags.dm
+++ b/code/modules/reagents/reagent_containers/rags.dm
@@ -39,7 +39,7 @@
C.visible_message("[user] is trying to smother \the [C] with \the [src]!", "[user] is trying to smother you with \the [src]!", "You hear some struggling and muffled cries of surprise.")
if(do_after(user, 20, target = C))
reagents.reaction(C, INGEST)
- reagents.trans_to(C, 5, log = TRUE)
+ reagents.trans_to(C, 5, log = "rag smother")
C.visible_message("[user] has smothered \the [C] with \the [src]!", "[user] has smothered you with \the [src]!", "You hear some struggling and a heavy breath taken.")
log_combat(user, C, "smothered", log_object)
else
@@ -107,7 +107,7 @@
reagents.clear_reagents()
else
msg += "'s liquids into \the [target]"
- reagents.trans_to(target, reagents.total_volume, log = TRUE)
+ reagents.trans_to(target, reagents.total_volume, log = "rag squeeze dry")
to_chat(user, "[msg].")
return TRUE
diff --git a/code/modules/recycling/disposal/bin.dm b/code/modules/recycling/disposal/bin.dm
index b106005a15..ef3a053027 100644
--- a/code/modules/recycling/disposal/bin.dm
+++ b/code/modules/recycling/disposal/bin.dm
@@ -141,7 +141,7 @@
update_icon()
/obj/machinery/disposal/proc/can_stuff_mob_in(mob/living/target, mob/living/user, pushing = FALSE)
- if(!pushing && !iscarbon(user) && !user.ventcrawler) //only carbon and ventcrawlers can climb into disposal by themselves.
+ if(!pushing && !iscarbon(user) && !(SEND_SIGNAL(user, COMSIG_CHECK_VENTCRAWL))) //only carbon and ventcrawlers can climb into disposal by themselves.
if(iscyborg(user))
var/mob/living/silicon/robot/borg = user
if (!borg.module || !borg.module.canDispose)
diff --git a/code/modules/research/designs/weapon_designs.dm b/code/modules/research/designs/weapon_designs.dm
index 8c934d39a9..11dd29a416 100644
--- a/code/modules/research/designs/weapon_designs.dm
+++ b/code/modules/research/designs/weapon_designs.dm
@@ -324,8 +324,7 @@
desc = "A tool that discharges controlled radiation which induces mutation in plant cells. Harmless to other organic life."
id = "flora_gun"
build_type = PROTOLATHE
- materials = list(/datum/material/iron = 2000, /datum/material/glass = 500)
- reagents_list = list(/datum/reagent/radium = 20)
+ materials = list(/datum/material/iron = 2000, /datum/material/glass = 500, /datum/material/uranium = 2000)
build_path = /obj/item/gun/energy/floragun
category = list("Weapons")
departmental_flags = DEPARTMENTAL_FLAG_SERVICE | DEPARTMENTAL_FLAG_SCIENCE
diff --git a/code/modules/research/xenobiology/crossbreeding/_status_effects.dm b/code/modules/research/xenobiology/crossbreeding/_status_effects.dm
index 9b19516f26..f3e14993ed 100644
--- a/code/modules/research/xenobiology/crossbreeding/_status_effects.dm
+++ b/code/modules/research/xenobiology/crossbreeding/_status_effects.dm
@@ -236,7 +236,7 @@
duration = -1
alert_type = null
-datum/status_effect/rebreathing/tick()
+/datum/status_effect/rebreathing/tick()
owner.adjustOxyLoss(-6, 0) //Just a bit more than normal breathing.
///////////////////////////////////////////////////////
@@ -469,6 +469,10 @@ datum/status_effect/rebreathing/tick()
qdel(src)
return ..()
+/datum/status_effect/stabilized/Destroy()
+ linked_extract = null
+ return ..()
+
/datum/status_effect/stabilized/null //This shouldn't ever happen, but just in case.
id = "stabilizednull"
@@ -524,7 +528,7 @@ datum/status_effect/rebreathing/tick()
ADD_TRAIT(owner, TRAIT_NOSLIPWATER, "slimestatus")
return ..()
-datum/status_effect/stabilized/blue/on_remove()
+/datum/status_effect/stabilized/blue/on_remove()
REMOVE_TRAIT(owner, TRAIT_NOSLIPWATER, "slimestatus")
return ..()
@@ -884,7 +888,8 @@ datum/status_effect/stabilized/blue/on_remove()
/datum/status_effect/stabilized/oil/tick()
if(owner.stat == DEAD)
explosion(get_turf(owner),1,2,4,flame_range = 5)
- owner.remove_status_effect(/datum/status_effect/stabilized/oil)
+ qdel(linked_extract)
+ return
return ..()
/datum/status_effect/stabilized/black
diff --git a/code/modules/ruins/lavalandruin_code/alien_nest.dm b/code/modules/ruins/lavalandruin_code/alien_nest.dm
index d98a6bf5c1..c204102b1b 100644
--- a/code/modules/ruins/lavalandruin_code/alien_nest.dm
+++ b/code/modules/ruins/lavalandruin_code/alien_nest.dm
@@ -5,6 +5,24 @@
name = "alien drone"
mob_name = "alien drone"
+/obj/effect/mob_spawn/alien/corpse/humanoid/hunter
+ mob_type = /mob/living/carbon/alien/humanoid/hunter
+ death = TRUE
+ name = "alien hunter"
+ mob_name = "alien hunter"
+
+/obj/effect/mob_spawn/alien/corpse/humanoid/sentinel
+ mob_type = /mob/living/carbon/alien/humanoid/sentinel
+ death = TRUE
+ name = "alien sentinel"
+ mob_name = "alien sentinel"
+
+/obj/effect/mob_spawn/alien/corpse/humanoid/praetorian
+ mob_type = /mob/living/carbon/alien/humanoid/royal/praetorian
+ death = TRUE
+ name = "alien praetorian"
+ mob_name = "alien praetorian"
+
/obj/effect/mob_spawn/alien/corpse/humanoid/queen
mob_type = /mob/living/carbon/alien/humanoid/royal/queen
death = TRUE
diff --git a/code/modules/shuttle/spaceship_navigation_beacon.dm b/code/modules/shuttle/spaceship_navigation_beacon.dm
index e389b32a94..7488bdd205 100644
--- a/code/modules/shuttle/spaceship_navigation_beacon.dm
+++ b/code/modules/shuttle/spaceship_navigation_beacon.dm
@@ -21,7 +21,7 @@
. = ..()
SSshuttle.beacons |= src
-obj/machinery/spaceship_navigation_beacon/emp_act()
+/obj/machinery/spaceship_navigation_beacon/emp_act()
locked = TRUE
/obj/machinery/spaceship_navigation_beacon/Destroy()
diff --git a/code/modules/smithing/finished_items.dm b/code/modules/smithing/finished_items.dm
index 5db6b09452..20eaee8a08 100644
--- a/code/modules/smithing/finished_items.dm
+++ b/code/modules/smithing/finished_items.dm
@@ -231,7 +231,7 @@
/obj/item/melee/smith/twohand/katana
name = "katana"
- icon_state = "katana"
+ icon_state = "katana-s"
overlay_state = "katanahilt"
force = 7
wielded_mult = 2
diff --git a/code/modules/surgery/dental_implant.dm b/code/modules/surgery/dental_implant.dm
index 311c886c9d..f41f299439 100644
--- a/code/modules/surgery/dental_implant.dm
+++ b/code/modules/surgery/dental_implant.dm
@@ -36,6 +36,6 @@
log_combat(owner, null, "swallowed an implanted pill", target)
if(target.reagents.total_volume)
target.reagents.reaction(owner, INGEST)
- target.reagents.trans_to(owner, target.reagents.total_volume, log = TRUE)
+ target.reagents.trans_to(owner, target.reagents.total_volume, log = "dental pill swallow")
qdel(target)
return 1
diff --git a/code/modules/surgery/organs/eyes.dm b/code/modules/surgery/organs/eyes.dm
index a088eb2e4f..09f0a901a3 100644
--- a/code/modules/surgery/organs/eyes.dm
+++ b/code/modules/surgery/organs/eyes.dm
@@ -404,6 +404,7 @@
on_mob.set_light(1, 1, current_color_string)
/obj/effect/abstract/eye_lighting
+ mouse_opacity = MOUSE_OPACITY_TRANSPARENT
var/obj/item/organ/eyes/robotic/glow/parent
/obj/effect/abstract/eye_lighting/Initialize()
diff --git a/code/modules/surgery/organs/heart.dm b/code/modules/surgery/organs/heart.dm
index 6b3d47b587..aaa4e34f36 100644
--- a/code/modules/surgery/organs/heart.dm
+++ b/code/modules/surgery/organs/heart.dm
@@ -97,7 +97,7 @@
owner.set_heartattack(TRUE)
failed = TRUE
-obj/item/organ/heart/slime
+/obj/item/organ/heart/slime
name = "slime heart"
desc = "It seems we've gotten to the slimy core of the matter."
icon_state = "heart-s-on"
@@ -221,7 +221,7 @@ obj/item/organ/heart/slime
var/rid = /datum/reagent/medicine/epinephrine
var/ramount = 10
-obj/item/organ/heart/cybernetic/upgraded/on_life()
+/obj/item/organ/heart/cybernetic/upgraded/on_life()
. = ..()
if(!.)
return
diff --git a/code/modules/surgery/organs/tongue.dm b/code/modules/surgery/organs/tongue.dm
index a3edfc2887..7cba3d358a 100644
--- a/code/modules/surgery/organs/tongue.dm
+++ b/code/modules/surgery/organs/tongue.dm
@@ -25,6 +25,7 @@
/datum/language/slime,
/datum/language/vampiric,
/datum/language/dwarf,
+ /datum/language/signlanguage,
))
healing_factor = STANDARD_ORGAN_HEALING*5 //Fast!!
decay_factor = STANDARD_ORGAN_DECAY/2
diff --git a/code/modules/surgery/organs/vocal_cords.dm b/code/modules/surgery/organs/vocal_cords.dm
index 47b504c86e..064abf1700 100644
--- a/code/modules/surgery/organs/vocal_cords.dm
+++ b/code/modules/surgery/organs/vocal_cords.dm
@@ -1,4 +1,5 @@
#define COOLDOWN_STUN 1200
+#define COOLDOWN_KNOCKDOWN 600
#define COOLDOWN_DAMAGE 600
#define COOLDOWN_MEME 300
#define COOLDOWN_NONE 100
@@ -213,7 +214,6 @@
var/static/regex/stun_words = regex("stop|wait|stand still|hold on|halt")
var/static/regex/knockdown_words = regex("drop|fall|trip|knockdown")
- var/static/regex/sleep_words = regex("sleep|slumber|rest")
var/static/regex/vomit_words = regex("vomit|throw up|sick")
var/static/regex/silence_words = regex("shut up|silence|be silent|ssh|quiet|hush")
var/static/regex/hallucinate_words = regex("see the truth|hallucinate")
@@ -264,26 +264,20 @@
cooldown = COOLDOWN_STUN
for(var/V in listeners)
var/mob/living/L = V
- L.Stun(60 * power_multiplier)
+ L.Stagger(60 * power_multiplier)
//KNOCKDOWN
else if(findtext(message, knockdown_words))
- cooldown = COOLDOWN_STUN
+ cooldown = COOLDOWN_KNOCKDOWN
for(var/V in listeners)
var/mob/living/L = V
- L.DefaultCombatKnockdown(60 * power_multiplier)
-
- //SLEEP
- else if((findtext(message, sleep_words)))
- cooldown = COOLDOWN_STUN
- for(var/mob/living/carbon/C in listeners)
- C.Sleeping(40 * power_multiplier)
+ L.DefaultCombatKnockdown()
//VOMIT
else if((findtext(message, vomit_words)))
- cooldown = COOLDOWN_STUN
+ cooldown = COOLDOWN_DAMAGE
for(var/mob/living/carbon/C in listeners)
- C.vomit(10 * power_multiplier, distance = power_multiplier)
+ C.vomit(10 * power_multiplier, distance = power_multiplier, stun = FALSE)
//SILENCE
else if((findtext(message, silence_words)))
diff --git a/code/modules/tcg/cards.dm b/code/modules/tcg/cards.dm
new file mode 100644
index 0000000000..970aef0bba
--- /dev/null
+++ b/code/modules/tcg/cards.dm
@@ -0,0 +1,714 @@
+#define TAPPED_ANGLE 90
+#define UNTAPPED_ANGLE 0
+
+#define COMMON_SERIES list(/datum/tcg_card/pack_1, /datum/tcg_card/exodia) //So star cards don't drop
+
+/datum/tcg_card
+ var/name = "Stupid Coder"
+ var/desc = "A coder that fucked up this card. Report if you see this."
+ var/rules = "Tap this card. It will ahelp itself"
+ var/icon_state = "cardback"
+ var/pack = 'icons/obj/tcg/pack_1.dmi'
+
+ var/mana_cost = 0
+ var/attack = 0
+ var/health = 0
+
+ var/faction = "Coderbus"
+ var/rarity = "Stoopid"
+ var/card_type = "Unit"
+
+ var/obj/item/tcg_card/card
+
+/*Uncomment if you want to make the game automatic
+
+/datum/tcg_card/proc/Use(datum/tcg_card/affected_card, mob/living/user)
+ if(card_type == "Equipment")
+ affected_card.health += health
+ affected_card.attack += attack
+ to_chat(user, "You use [card] on [affected_card.card], upgrading it's stats.")
+ user.emote("uses [card] on [affected_card.card], upgrading it's stats.") //To get that visible emote. Useful if you want nice gameplay
+ else if (card_type == "Unit")
+ affected_card.health -= attack
+ health -= affected_card.attack
+ var/flavortext = "."
+ if(affected_card.health <= 0)
+ flavortext = ", killing [affected_card.card]!"
+ if(health <= 0)
+ flavortext = ", killing both [affected_card.card] and [card]!"
+ else
+ flavortext = ", killing [card] in the process!"
+ to_chat(user, "You attack [affected_card.card] with [card][flavortext]")
+ user.emote("attacks [affected_card.card] with [card][flavortext]")
+
+*/
+
+/datum/tcg_card/proc/UseSelf(mob/living/user)
+ return
+
+/datum/tcg_card/proc/Tap(mob/living/user) //Actually runtimes on tap! Tapping is basically disabling a card for a turn in exchange for special effects
+ if(type == /datum/tcg_card)
+ log_runtime("[user] managed to get a blank TCG card.")
+
+/datum/tcg_card/proc/Untap(mob/living/user)
+ return
+
+/datum/tcg_card/proc/Reset(mob/living/user)
+ to_chat(user, "You reset [card]'s stats to original.")
+ mana_cost = initial(mana_cost)
+ rules = initial(rules)
+ health = initial(health)
+ attack = initial(attack)
+ faction = initial(faction)
+
+/obj/item/tcg_card
+ name = "TCG card"
+ desc = "A flipped TCG-branded card."
+ icon_state = "cardback"
+ icon = 'icons/obj/tcg/pack_1.dmi'
+
+ var/datum_type = /datum/tcg_card
+ var/datum/tcg_card/card_datum
+
+ w_class = WEIGHT_CLASS_TINY
+
+ var/flipped = FALSE
+ var/tapped = FALSE
+ var/special = FALSE
+ var/illegal = FALSE
+
+/obj/item/tcg_card/special
+ special = TRUE
+
+/obj/item/tcg_card/examine(mob/user)
+ . = ..()
+ sleep(2) //So it prints this shit after the examine
+ if(flipped)
+ return
+ to_chat(user, "This card has following stats:")
+ to_chat(user, "Mana cost: [card_datum.mana_cost]")
+ to_chat(user, "Health: [card_datum.health]")
+ to_chat(user, "Attack: [card_datum.attack]")
+ to_chat(user, "Faction: [card_datum.faction]")
+ to_chat(user, "Rarity: [card_datum.rarity]")
+ to_chat(user, "Card Type: [card_datum.card_type]")
+ to_chat(user, "It's effect is: [card_datum.rules]")
+ if(illegal)
+ to_chat(user, "It's a low-quality copy of a real card. TCG Gaming Community won't probably accept it.") //Doesn't do crap, just for lulz
+
+/obj/item/tcg_card/openTip(location, control, params, user) //Overriding for nice UI
+ if(flipped)
+ return ..()
+ var/desc_content = "[desc] \
+ This card has following stats: \
+ Mana cost: [card_datum.mana_cost] \
+ Health: [card_datum.health] \
+ Attack: [card_datum.attack] \
+ Faction: [card_datum.faction] \
+ Rarity: [card_datum.rarity] \
+ Card Type: [card_datum.card_type] \
+ It's effect is: [card_datum.rules]"
+ openToolTip(user,src,params,title = name,content = desc_content,theme = "")
+
+/obj/item/tcg_card/New(loc, new_datum, illegal_card = FALSE)
+ . = ..()
+ if(!special)
+ datum_type = new_datum
+ card_datum = new datum_type
+ icon = card_datum.pack
+ icon_state = card_datum.icon_state
+ name = card_datum.name
+ desc = card_datum.desc
+ illegal = illegal_card
+
+ switch(card_datum.rarity)
+ if("Common")
+ grind_results = list(/datum/reagent/card_powder/green = 1)
+ if("Rare")
+ grind_results = list(/datum/reagent/card_powder/blue = 1)
+ if("Epic")
+ grind_results = list(/datum/reagent/card_powder/purple = 1)
+ if("Legendary")
+ grind_results = list(/datum/reagent/card_powder/yellow = 1)
+ if("Exodia")
+ grind_results = list(/datum/reagent/card_powder/black = 1)
+
+/obj/item/tcg_card/attack_hand(mob/user)
+ var/list/possible_actions = list(
+ "Pick Up" = image(icon = 'icons/mob/radial.dmi', icon_state = "radial_pickup"),
+ "Tap" = image(icon = 'icons/mob/radial.dmi', icon_state = "radial_tap"),
+ "Flip" = image(icon = 'icons/mob/radial.dmi', icon_state = "radial_flip")
+ )
+ var/result = show_radial_menu(user, src, possible_actions, require_near = TRUE, tooltips = TRUE)
+ switch(result)
+ if("Pick Up")
+ . = ..()
+ if("Flip")
+ flipped = !flipped
+ if(flipped)
+ icon_state = "cardback"
+ name = "TCG card"
+ desc = "A flipped TCG-branded card."
+ else
+ name = card_datum.name
+ desc = card_datum.desc
+ icon_state = card_datum.icon_state
+ if("Tap")
+ var/matrix/ntransform = matrix(transform)
+ if(tapped)
+ ntransform.TurnTo(TAPPED_ANGLE , UNTAPPED_ANGLE)
+ else
+ ntransform.TurnTo(UNTAPPED_ANGLE , TAPPED_ANGLE)
+ tapped = !tapped
+ animate(src, transform = ntransform, time = 2, easing = (EASE_IN|EASE_OUT))
+ if(tapped)
+ card_datum.Tap(user)
+ else
+ card_datum.Untap(user)
+
+/obj/item/tcg_card/attackby(obj/item/I, mob/living/user, params)
+ if(istype(I, /obj/item/tcg_card))
+ var/obj/item/tcg_card/second_card = I
+ if(loc == user && second_card.loc == user)
+ var/obj/item/tcgcard_hand/hand = new(get_turf(user))
+ src.forceMove(hand)
+ second_card.forceMove(hand)
+ hand.cards.Add(src)
+ hand.cards.Add(second_card)
+ user.put_in_hands(hand)
+ hand.update_icon()
+ return ..()
+ var/obj/item/tcgcard_deck/new_deck = new /obj/item/tcgcard_deck(drop_location())
+ new_deck.flipped = flipped
+ user.transferItemToLoc(second_card, new_deck)//Start a new pile with both cards, in the order of card placement.
+ user.transferItemToLoc(src, new_deck)
+ new_deck.update_icon_state()
+ user.put_in_hands(new_deck)
+ new_deck.update_icon()
+ if(istype(I, /obj/item/tcgcard_deck))
+ var/obj/item/tcgcard_deck/old_deck = I
+ if(length(old_deck.contents) >= 30)
+ to_chat(user, "This pile has too many cards for a regular deck!")
+ return
+ user.transferItemToLoc(src, old_deck)
+ flipped = old_deck.flipped
+ old_deck.update_icon()
+ update_icon()
+ return ..()
+
+/obj/item/tcg_card/attack_self(mob/user)
+ var/list/possible_actions = list(
+ "Reset to Default" = image(icon = 'icons/mob/radial.dmi', icon_state = "radial_reset"),
+ "Change stats" = image(icon = 'icons/mob/radial.dmi', icon_state = "radial_change_stats")
+ )
+ var/result = show_radial_menu(user, src, possible_actions, require_near = TRUE, tooltips = TRUE)
+ switch(result)
+ if("Reset to Default")
+ card_datum.Reset(user)
+ user.visible_message("[user] resets [src]'s stats.")
+ if("Change stats")
+ possible_actions = list(
+ "Health" = image(icon = 'icons/mob/radial.dmi', icon_state = "radial_health"),
+ "Attack" = image(icon = 'icons/mob/radial.dmi', icon_state = "radial_attack"),
+ "Mana" = image(icon = 'icons/mob/radial.dmi', icon_state = "radial_mana")
+ )
+ result = show_radial_menu(user, src, possible_actions, require_near = TRUE, tooltips = TRUE)
+ switch(result)
+ if("Health")
+ card_datum.health = input(user, "What do you want health to be?", "Changing [src]'s health") as num|null
+ if("Attack")
+ card_datum.attack = input(user, "What do you want attack to be?", "Changing [src]'s attack") as num|null
+ if("Mana")
+ card_datum.mana_cost = input(user, "What do you want mana cost to be?", "Changing [src]'s mana cost") as num|null
+ user.visible_message("[user] changes [src]'s [result].")
+
+/obj/item/tcg_card/equipped(mob/user, slot, initial)
+ . = ..()
+ transform = matrix()
+
+/obj/item/tcg_card/dropped(mob/user, silent)
+ . = ..()
+ transform = matrix(0.5,0,0,0,0.5,0)
+
+/obj/item/cardpack
+ name = "Trading Card Pack: Coder"
+ desc = "Contains six complete fuckups by the coders. Report this on github please!"
+ icon = 'icons/obj/tcg/misc.dmi'
+ icon_state = "cardpack"
+ w_class = WEIGHT_CLASS_TINY
+ ///The card series to look in
+ var/list/series = list(/datum/tcg_card/pack_1, /datum/tcg_card/exodia)
+ ///Chance of the pack having a coin in it out of 10
+ var/contains_coin = -1
+ ///The amount of cards to draw from the rarity table
+ var/card_count = 5
+ ///The rarity table, the set must contain at least one of each
+ var/list/rarity_table = list(
+ "Common" = 900,
+ "Rare" = 300,
+ "Epic" = 50,
+ "Legendary" = 3,
+ "Exodia" = 1) //Basically 0.1%, it doesn't have guar. rarity
+ ///The amount of cards to draw from the guarenteed rarity table
+ var/guaranteed_count = 1
+ ///The guaranteed rarity table, acts about the same as the rarity table. it can have as many or as few raritys as you'd like
+ var/list/guar_rarity = list(
+ "Legendary" = 1,
+ "Epic" = 9,
+ "Rare" = 30)
+
+ var/illegal = FALSE //Can cargo get it?
+
+ custom_price = PRICE_EXPENSIVE
+
+/obj/item/cardpack/series_one
+ name = "Trading Card Pack: 2560 Core Set"
+ desc = "Contains six cards of varying rarity from the 2560 Core Set. Collect them all!"
+ icon_state = "cardpack"
+ series = list(/datum/tcg_card/pack_1, /datum/tcg_card/exodia)
+ contains_coin = 10
+
+/obj/item/cardpack/syndicate //More cards. Perfect stuff for gaming gang
+ name = "Trading Card Pack: Nuclear Danger"
+ desc = "Contains twelve cards of varying rarity from 2560 Core Set and 2560 Nuclear Danger. This pack was stamped by Waffle Co."
+ icon_state = "cardpack_syndicate"
+ series = list(/datum/tcg_card/pack_1, /datum/tcg_card/pack_nuclear)
+ contains_coin = 100
+
+ card_count = 9
+ guaranteed_count = 3
+
+ guar_rarity = list( //Better chances
+ "Legendary" = 5,
+ "Epic" = 10,
+ "Rare" = 30)
+
+/obj/item/cardpack/equipped(mob/user, slot, initial)
+ . = ..()
+ transform = matrix()
+
+/obj/item/cardpack/dropped(mob/user, silent)
+ . = ..()
+ transform = matrix(0.5,0,0,0,0.5,0)
+
+/obj/item/cardpack/attack_self(mob/user)
+ . = ..()
+ var/list/cards = buildCardListWithRarity(card_count, guaranteed_count)
+ var/obj/item/tcgcard_hand/hand = new(get_turf(user))
+ for(var/template in cards)
+ var/obj/item/tcg_card/card = new(hand, template, illegal)
+ hand.cards.Add(card)
+ user.put_in_hands(hand)
+ hand.update_icon()
+ to_chat(user, "Wow! Check out these cards!")
+ playsound(loc, 'sound/items/poster_ripped.ogg', 20, TRUE)
+ if(prob(contains_coin))
+ to_chat(user, "...and it came with a flipper, too!")
+ new /obj/item/coin/thunderdome(get_turf(user))
+ new /obj/item/tcg_rules(get_turf(user))
+ qdel(src)
+
+/obj/item/cardpack/proc/buildCardListWithRarity(card_cnt, rarity_cnt)
+ var/list/return_cards = list()
+
+ var/list/cards = list()
+ for(var/card_type in series)
+ for(var/card in subtypesof(card_type))
+ var/datum/tcg_card/new_card = new card()
+ if(new_card.name == "Stupid Coder")
+ continue
+ cards.Add(card)
+ qdel(new_card)
+ var/list/possible_cards = list()
+ var/list/rarity_cards = list("Exodia" = list(), "Legendary" = list(), "Epic" = list(), "Rare" = list(), "Common" = list())
+ for(var/card in cards)
+ var/datum/tcg_card/new_card = new card()
+ if(new_card.name == "Stupid Coder")
+ continue
+ possible_cards[card] = rarity_table[new_card.rarity]
+ var/list/rarity_card_type = rarity_cards[new_card.rarity]
+ if(!rarity_card_type)
+ rarity_card_type = list()
+ rarity_card_type.Add(card)
+ rarity_cards[new_card.rarity] = rarity_card_type //FUCK CI
+ qdel(new_card)
+
+ for(var/card_counter = 1 to card_count)
+ var/cardtype = pickweight(possible_cards)
+ return_cards.Add(cardtype)
+
+ for(var/card_counter = 1 to guaranteed_count)
+ var/card_list = pickweight(guar_rarity)
+ return_cards.Add(pick(rarity_cards[card_list]))
+
+ return return_cards
+
+/obj/item/coin/thunderdome
+ name = "Thunderdome Flipper"
+ desc = "A Thunderdome TCG flipper, for deciding who gets to go first. Also conveniently acts as a counter, for various purposes."
+ icon = 'icons/obj/tcg/misc.dmi'
+ icon_state = "coin_nanotrasen"
+ custom_materials = list(/datum/material/plastic = 400)
+ material_flags = NONE
+ sideslist = list("nanotrasen", "syndicate")
+
+/obj/item/coin/thunderdome/Initialize()
+ . = ..()
+ transform = matrix(0.5,0,0,0,0.5,0)
+
+/obj/item/coin/thunderdome/equipped(mob/user, slot, initial)
+ . = ..()
+ transform = matrix()
+
+/obj/item/coin/thunderdome/dropped(mob/user, silent)
+ . = ..()
+ transform = matrix(0.5,0,0,0,0.5,0)
+
+/obj/item/tcgcard_deck
+ name = "Trading Card Pile"
+ desc = "A stack of TCG cards."
+ icon = 'icons/obj/tcg/misc.dmi'
+ icon_state = "deck_up"
+
+ var/flipped = FALSE
+
+ var/static/radial_draw = image(icon = 'icons/mob/radial.dmi', icon_state = "radial_draw")
+ var/static/radial_shuffle = image(icon = 'icons/mob/radial.dmi', icon_state = "radial_shuffle")
+ var/static/radial_pickup = image(icon = 'icons/mob/radial.dmi', icon_state = "radial_pickup")
+
+/obj/item/tcgcard_deck/Initialize()
+ . = ..()
+ LoadComponent(/datum/component/storage/concrete/tcg)
+
+/obj/item/tcgcard_deck/update_icon_state()
+ . = ..()
+ if(flipped)
+ switch(contents.len)
+ if(1 to 10)
+ icon_state = "deck_tcg_low"
+ if(11 to 20)
+ icon_state = "deck_tcg_half"
+ if(21 to INFINITY)
+ icon_state = "deck_tcg_full"
+ else
+ icon_state = "deck_up"
+
+/obj/item/tcgcard_deck/examine(mob/user)
+ . = ..()
+ . += "\The [src] has [contents.len] cards inside."
+
+/obj/item/tcgcard_deck/attack_hand(mob/user)
+ var/list/choices = list(
+ "Draw" = image(icon = 'icons/mob/radial.dmi', icon_state = "radial_draw"),
+ "Shuffle" = image(icon = 'icons/mob/radial.dmi', icon_state = "radial_shuffle"),
+ "Pickup" = image(icon = 'icons/mob/radial.dmi', icon_state = "radial_pickup"),
+ "Flip" = image(icon = 'icons/mob/radial.dmi', icon_state = "radial_flip"),
+ )
+ var/choice = show_radial_menu(user, src, choices, custom_check = CALLBACK(src, .proc/check_menu, user), require_near = TRUE, tooltips = TRUE)
+ if(!check_menu(user))
+ return
+ switch(choice)
+ if("Draw")
+ draw_card(user)
+ if("Shuffle")
+ shuffle_deck(user)
+ if("Pickup")
+ user.put_in_hands(src)
+ if("Flip")
+ flip_deck()
+
+/obj/item/tcgcard_deck/Destroy()
+ for(var/card in 1 to contents.len)
+ var/obj/item/tcg_card/stored_card = contents[card]
+ stored_card.forceMove(drop_location())
+ . = ..()
+
+/obj/item/tcgcard_deck/proc/check_menu(mob/living/user)
+ if(!istype(user))
+ return FALSE
+ if(user.incapacitated() || !user.Adjacent(src))
+ return FALSE
+ return TRUE
+
+/obj/item/tcgcard_deck/attackby(obj/item/I, mob/living/user, params)
+ . = ..()
+ if(istype(I, /obj/item/tcg_card))
+ if(contents.len > 30)
+ to_chat(user, "This pile has too many cards for a regular deck!")
+ return FALSE
+ var/obj/item/tcg_card/new_card = I
+ new_card.flipped = flipped
+ new_card.forceMove(src)
+
+/obj/item/tcgcard_deck/attack_self(mob/living/carbon/user)
+ shuffle_deck(user)
+ return ..()
+
+/obj/item/tcgcard_deck/proc/draw_card(mob/user)
+ if(!contents.len)
+ CRASH("A TCG deck was created with no cards inside of it.")
+ var/obj/item/tcg_card/drawn_card = contents[contents.len]
+ user.put_in_hands(drawn_card)
+ drawn_card.flipped = flipped //If it's a face down deck, it'll be drawn face down, if it's a face up pile you'll draw it face up.
+ drawn_card.update_icon_state()
+ user.visible_message("[user] draws a card from \the [src]!", \
+ "You draw a card from \the [src]!")
+ if(contents.len <= 1)
+ var/obj/item/tcg_card/final_card = contents[1]
+ user.transferItemToLoc(final_card, drop_location())
+ qdel(src)
+
+/obj/item/tcgcard_deck/proc/shuffle_deck(mob/user, visable = TRUE)
+ if(!contents)
+ return
+ contents = shuffle(contents)
+ if(user.active_storage)
+ user.active_storage.close(user)
+ if(visable)
+ user.visible_message("[user] shuffles \the [src]!", \
+ "You shuffle \the [src]!")
+
+/obj/item/tcgcard_deck/proc/flip_deck()
+ flipped = !flipped
+ var/list/temp_deck = contents.Copy()
+ contents = reverseRange(temp_deck)
+ //Now flip the cards to their opposite positions.
+ for(var/a in 1 to contents.len)
+ var/obj/item/tcg_card/nu_card = contents[a]
+ nu_card.flipped = flipped
+ nu_card.update_icon_state()
+ update_icon_state()
+
+/obj/item/tcgcard_hand
+ name = "Trading Card Hand"
+ desc = "A hand full of TCG cards."
+ icon = 'icons/effects/effects.dmi'
+ icon_state = "nothing"
+ w_class = WEIGHT_CLASS_TINY
+ var/list/cards = list()
+
+/obj/item/tcgcard_hand/update_icon()
+ . = ..()
+ cut_overlays()
+ var/angular = length(cards) / 2 * -30 + 15
+ for(var/obj/item/tcg_card/card in cards)
+ var/image/I = image(icon = card.icon, icon_state = card.icon_state)
+ var/matrix/ntransform = matrix(I.transform)
+ ntransform.TurnTo(angular, 0)
+ ntransform.Translate(sin(angular) * -15, cos(angular) * 15)
+ I.transform = ntransform
+ angular += 30
+ overlays += I
+
+/obj/item/tcgcard_hand/attackby(obj/item/I, mob/living/user, params)
+ if(istype(I, /obj/item/tcg_card))
+ var/obj/item/tcg_card/card = I
+ if(loc == user && card.loc == user)
+ card.forceMove(src)
+ cards.Add(card)
+ update_icon()
+ . = ..()
+
+/obj/item/tcgcard_hand/attack_hand(mob/living/carbon/user)
+ if(loc == user)
+ var/list/choices = list()
+ for(var/obj/item/tcg_card/card in cards)
+ choices[card] = image(icon = card.icon, icon_state = card.icon_state)
+ var/obj/item/tcg_card/choice = show_radial_menu(user, src, choices, require_near = TRUE, tooltips = TRUE)
+ if(choice)
+ choice.forceMove(get_turf(src))
+ user.put_in_hands(choice)
+ cards.Remove(choice)
+ update_icon()
+ if(length(cards) == 0)
+ qdel(src)
+ return
+ . = ..()
+
+/obj/item/tcgcard_binder
+ name = "Trading Card Binder"
+ desc = "A TCG-branded card binder, specifically for your infinite collection of TCG cards!"
+ icon = 'icons/obj/tcg/misc.dmi'
+ icon_state = "binder"
+
+ var/list/cards = list()
+ var/mode = 0 //If 1, will show all the cards even if you don't have em
+
+/obj/item/tcgcard_binder/attackby(obj/item/I, mob/living/user, params)
+ if(istype(I, /obj/item/tcg_card))
+ var/obj/item/tcg_card/card = I
+ card.forceMove(src)
+ cards.Add(card)
+ . = ..()
+
+/obj/item/tcgcard_binder/attack_self(mob/living/carbon/user)
+ mode = !mode
+ to_chat(user, "[src] now shows you [mode ? "all the different cards" : "the cards you already have"].")
+
+/obj/item/tcgcard_binder/attack_hand(mob/living/carbon/user)
+ if(loc == user)
+ var/list/choices = list()
+ if(mode)
+ var/card_types = list()
+
+ for(var/obj/item/tcg_card/card in cards)
+ card_types[card.datum_type] = card
+
+ for(var/card_type in subtypesof(/datum/tcg_card))
+ if(card_type in card_types)
+ var/obj/item/tcg_card/card = card_types[card_type]
+ choices[card] = image(icon = card.icon, icon_state = card.icon_state)
+ continue
+
+ var/datum/tcg_card/card_dat = new card_type
+ if(card_dat.name == "Stupid Coder")
+ continue
+ var/image/I = image(icon = card_dat.pack, icon_state = card_dat.icon_state)
+ I.color = "#999999"
+ choices[card_dat.name] = I
+ qdel(card_dat)
+ else
+ for(var/obj/item/tcg_card/card in cards)
+ choices[card] = image(icon = card.icon, icon_state = card.icon_state)
+ var/obj/item/tcg_card/choice = show_radial_menu(user, src, choices, require_near = TRUE, tooltips = TRUE)
+ if(choice && (choice in cards))
+ choice.forceMove(get_turf(src))
+ user.put_in_hands(choice)
+ cards.Remove(choice)
+
+ if(choice)
+ return
+ . = ..()
+
+/obj/item/tcgcard_binder/proc/check_for_exodia()
+ var/list/card_types = list()
+ for(var/obj/item/tcg_card/card in cards)
+ card_types.Add(card.datum_type)
+
+ for(var/card_type in subtypesof(/datum/tcg_card))
+ var/datum/tcg_card/card_dat = new card_type
+
+ if(card_dat.name == "Eldritch Horror" && (card_type in card_types)) //We already have Exodia saved
+ qdel(card_dat)
+ return
+
+ if(card_dat.name == "Stupid Coder" || card_dat.name == "Eldritch Horror") //It would be stupid if we require exodia or system cards to get exodia
+ continue
+ qdel(card_dat)
+ if(!(card_type in card_types))
+ return
+
+ var/obj/item/tcg_card/card = new(get_turf(src), /datum/tcg_card/exodia/exodia)
+ card.forceMove(src)
+ cards.Add(card)
+
+/obj/item/tcgcard_binder/full/Initialize() //For admemes.
+ . = ..()
+ for(var/cardtype in subtypesof(/datum/tcg_card))
+ var/obj/item/tcg_card/card = new(get_turf(src), cardtype)
+ if(card.card_datum.name == "Stupid Coder")
+ qdel(card)
+ continue
+ card.forceMove(src)
+ cards.Add(card)
+
+/obj/item/tcg_rules
+ name = "TCG Rulebook"
+ desc = "A small rulebook containing a starter guide for TCG."
+ icon = 'icons/obj/tcg/misc.dmi'
+ icon_state = "deck_low"
+ w_class = WEIGHT_CLASS_TINY
+
+/obj/item/tcg_rules/examine(mob/user)
+ . = ..()
+ . += "*---------* \n\
+ Welcome to the Exciting world of Tactical Card Game!Sponsored by Nanotrasen Edu-tainment Devision. \n \
+ Core Rules: \n \
+ Tactical Card Game (Also known as TCG) is a traditional trading card game. It's played between two players, each with a deck or collection of cards. \n \
+
+ Each player's deck contains up to 30 cards. Each player's hand can hold a maximum of 7 cards. At the end of your turn, if you have more than 7 cards, you must choose cards to discard to your discard pile until you have 7 cards. \n \
+ To begin a match, both players must flip a coin to decide who goes first. The winner of the coin toss then decides if they go first or second. Before the match begins each player draws 5 cards each with the ability to mulligan cards from their hand facedown once (Basically, you get a first pass where you can replace cards in your hands back into your deck, shuffle your deck, then draw until you're back to 5). \n \
+ Each player begins with 1 Max Mana to start with, which serves as the cost to playing cards. \n \
+
+ In order to play the TCG, a deck is required. As stated above, decks must contain up to 30 cards. \n \
+ Additionally, to save cards you need to have a card binder on yourself to store the cards. When the shift ends, your cards will be automatically saved by integrated scanners in your card binder. \n \
+ Finally, a stock of Thunderdome Flippers to use for coin tosses and counter effects is recommended- these can be obtained occasionally from cardpacks, but any coin will do. \n \
+
+ Win condition is simple - kill your opponent's hero by depleting all of their 20 lifeshards. \n \
+
+ Gameplay Phases: \n \
+
+ A single turn of the game goes as follows, and the order of card effects is very similar to other card games. Within a single turn, the following phases are gone through, in order, unless otherwise altered by a card effect. Turn Phases are the Draw Phase, Effect Phase 1, Play Phase, Combat Phase, Effect Phase 2, and the End Phase. \n \
+
+ During the draw phase, the player whose turn it is untaps all their cards, then draws a single card. They gain 1 Max Mana, and their Mana is refilled. Cards with missing health due to defending, attacking, or damage effects return to max health at the end of the draw phase. \n \
+ During the First Effect Phase, this is when effects that take place at the start of your turn would occur. If an opponent's effect takes place at the start of your turn, their effects will always take place first, then yours, unless otherwise stated by a card effect. If an opponent's effect would cause you to lose the game, and your effects would prevent that condition from happening afterwards, you would lose the game. As a general roll, when it's your turn, your opponent's effects take place FIRST, then yours. \n \
+
+ During the Play Phase, this is when you can play, summon, or activate your own cards. Card Effects that don't state when they're activated MUST be activated during the Play Phase. Your opponent can also activate their own card effects in response to one of your actions during your play phase, if able. Any card played during the play phase can activate its effect as soon as it's played. More details within the Card Breakdown section. \n \
+
+ During the Battle Phase, a Unit Card is able to battle other Unit Cards, or attack their opponent once per turn. Neither player can attack on their first turn, and all cards that enter the field can attack as soon as they can, unless it is that player's first turn, or they are prevented by a card effect. More details within the Card Combat section. \n \
+
+ During the End Phase, end of turn effects will occur. If the active player has more than 7 cards in their hand by this point, this is when they must discard cards. All of the player's cards who used an effect at any point in the turn are refreshed, and able to use their effect again going into the opponent's turn. By the end of their turn, if the player has more than 7 cards, they must discard cards from their hand until 7 remain. \n \
+ After all 5 phases have passed, the players turn officially ends, and the opponent begins their turn, starting anew from the draw phase. \n \
+
+ Card effects are typically limited to the turn that that card is played. For example, a card effect that provides a card +1/+1 attack/health would only last until the end of the turn, unless otherwise stated, OR if the card is an Equipment Card. More on those below. \n \
+
+ Card Breakdown: \n \
+
+ Within the game, there are 3 kinds of cards (So far), Unit, Equipment and Spell cards. \n \
+
+ Unit Cards. All Unit Cards have 4 core values to keep in mind, Attack, Health, Faction, and Summoning Cost. Attack serves as a card's offensive value in combat. Health serves as a card's defensive value in combat, and doubles as a card's health. Factions are groupings of cards that can often share effects and traits together. Summoning Cost is how much mana a card needs in order to be summoned. \n \
+
+ Equipment Cards. All Equipment Cards similarly to Unit Cards have Attack, Health, and Summon Cost values, but for equipment, these values are added to the attached card's values. Equipment can only be attached (Equip) to units, and they last until the unit dies, or otherwise leaves the field, following it's equipt card. If returned to the hand, send to the discard pile, or otherwise leaves the field, it is detatched from the equipt card. When a Equipment Card increases a card's attack or health, those effects stay on the equip card until the equipment is unequip or removed from the parent card. \n \
+ If a card would have it's health decreased by having it's equip card removed, it's handled by having it's maximum health decreased, not it's current health. For example, lets say you had a card with 1/1 attack/health, and give it an equipment giving it +1/+2, then that card enters combat, dropping it down to 2/1. If by an opponent's card effect it lost that +1/+2 equipment now, it's stats would be 1/1 once again. If an equip card explicitly lowers a card's stats, it is possible for a card to be killed as a result, but drops in attack will always bottom out at 0 attack at any given time. \n \
+
+ Spell Cards. Spell Cards don't have attack or health values, instead, they activate their effects as soon as they are summoned and leave the field afterwards(if not stated otherwise). \n \
+
+ Card Subtypes: \n \
+
+ Card effects: \n \
+ Asimov - Unit cannot attack units with Human subtype \n \
+ Changeling - Unit posesses all the subtypes at the same time \n \
+ Greytide - On summon, unit gains amount of power equal to amount of other units with Greytide for 1 turn \n \
+ Holy - Unit can't be targeted by spells \n \
+ Taunt - All opposing unit attacks must be directed towards the unit with Taunt. \n \
+ First Strike - This unit attacks first. If attacked unit is dead, unit doesn't recieve damage from it. \n \
+ Deadeye - This unit can always hit opponents, regardless of effects or immunities. \n \
+ Squad Tactics - When this unit attacks an opponent's unit and defeats it in combat, the owner of the defeated card takes 1 lifeshard of damage from combat. \n \
+ Immunity - The unit cannot be affected by card effects or combat of its immunity type. This includes both friendly and opposing effects. \n \
+ Fury - The unit must attack at every possibility. \n \
+ Blocker - The unit cannot declare attacks, but can defend. \n \
+ Hivemind - The unit enters combat with a hivemind token on it. The first time this card would take damage, remove that token instead. This does not apply to instant removal effects, only points of damage. \n \
+ Clockwork - The unit can copy a single keyword on another unit on the field, until they lose the clockwork keyword or leave the field. \n \
+
+ Card Combat: \n \
+
+ Card combat is determined as follows. On your turn, any non-tapped unit card with a positive attack power is capable of declaring an attack. Upon declaring an attack, you must state if you're attacking your opponent directly, or if you're going to attack a specific opponent's unit. Unless otherwise stated, cards can only attack or defend one time per turn. \n \
+
+ An attack against a unit healths as follows: Both units will do their power as damage to the opponent's unit's health. Damage is typically dealt at the same time, and if both units would kill each other through combat, both are destroyed at the same time. If One or both units would not be destroyed by combat, they would have their health reduced by the difference of their health minus their opponent's power, until the start of your next turn. If the attacker or defender has a keyword or effect that prevents them from attacking their opponent (Like silicon, immunity), then they are not able to attack, but may still defend against the opponent's attack. Once combat has healthd, all remaining participants become tapped. \n \
+
+ A direct attack healths as follows: The attacking unit declares an attack against the opponent's lifeshards. Your opponent may then declare a defender if one is available, who will then turn the combat into an attack against a unit for the purposes of combat that turn. If the attack is not blocked, and the direct attack connects, then your opponent loses a number of lifeshards equal to the attacking units power. "
+
+/obj/item/cardboard_card
+ name = "cardboard card cutout"
+ desc = "A small piece of cardboard shaped as a TCG card."
+ icon = 'icons/obj/tcg/misc.dmi'
+ icon_state = "template"
+
+/datum/reagent/card_powder/reaction_obj(obj/O, reac_volume)
+ if(istype(O, /obj/item/cardboard_card))
+ var/list/possible_cards = list()
+ for(var/card_series in COMMON_SERIES)
+ for(var/card_type in subtypesof(card_series))
+ var/datum/tcg_card/card = new card_type
+ if(card.rarity == rarity)
+ possible_cards.Add(card_type)
+ qdel(card)
+ if(length(possible_cards))
+ new /obj/item/tcg_card(get_turf(O), pick(possible_cards), TRUE)
+ qdel(O)
+
+ . = ..()
+
+#undef COMMON_SERIES
+#undef TAPPED_ANGLE
+#undef UNTAPPED_ANGLE
diff --git a/code/modules/tcg/pack_1.dm b/code/modules/tcg/pack_1.dm
new file mode 100644
index 0000000000..a3920fcdaa
--- /dev/null
+++ b/code/modules/tcg/pack_1.dm
@@ -0,0 +1,1431 @@
+/datum/tcg_card/pack_1
+ pack = 'icons/obj/tcg/pack_1.dmi'
+
+//COMMAND
+
+/datum/tcg_card/pack_1/captain
+ name = "Captain"
+ desc = "Nanotrasen hires a captain for every station. However, most of the time they just drink wishkey and secure the disk."
+ rules = "Human. Tap this card for 1 mana: inflict -1/-1 to an opposing creature card."
+ icon_state = "captain"
+
+ mana_cost = 7
+ attack = 5
+ health = 5
+
+ faction = "Command"
+ rarity = "Epic"
+ card_type = "Unit"
+
+/datum/tcg_card/pack_1/captain_hardsuit
+ name = "Apadyne Technologies Mk.2 R.I.O.T. Suit (Captain's Version)"
+ desc = "A heavily customised Apadyne Technologies Mk.2 R.I.O.T. Suit, rebuilt and refitted to Nanotrasen's highest standards for issue to Station Captains."
+ rules = "On equip: Equipped unit gains +1/+1 for one turn"
+ icon_state = "captain_hardsuit"
+
+ mana_cost = 3
+ attack = -1
+ health = 5
+
+ faction = "Command"
+ rarity = "Legendary"
+ card_type = "Equipment"
+
+/datum/tcg_card/pack_1/hop
+ name = "Head of Personnel"
+ desc = "The head of the Cargo and Service Departments, guardian of all access, and Ian's lovable, yet dumb, sidekick."
+ rules = "Human. Blocker. Once per turn: A friendly card of your choice attacks twice."
+ icon_state = "hop"
+
+ mana_cost = 7
+ attack = 4
+ health = 3
+
+ faction = "Command"
+ rarity = "Rare"
+ card_type = "Unit"
+
+/datum/tcg_card/pack_1/ian_hop
+ name = "Head of Ians"
+ desc = "What can be better than a corgi? A corgi with all access and HoP's hat!"
+ rules = "On summon: Summon a Command unit for free."
+ icon_state = "hop_ian"
+
+ mana_cost = 5
+ attack = 0
+ health = 4
+
+ faction = "Command"
+ rarity = "Epic"
+ card_type = "Unit"
+
+/datum/tcg_card/pack_1/cmo
+ name = "Chief Medical Officer"
+ desc = "Head of the medical department, the CMO is expected to maintain the standards of his underlings."
+ rules = "Human. Whenever a Medical unit gains power, it gains +1 more."
+ icon_state = "cmo"
+
+ mana_cost = 5
+ attack = 4
+ health = 4
+
+ faction = "Command"
+ rarity = "Common"
+ card_type = "Unit"
+
+/datum/tcg_card/pack_1/cmo_suit
+ name = "DeForest Medical Corporation 'Lifesaver' Carapace"
+ desc = "An advanced voidsuit designed for emergency medical personnel. Features include a built-in medical HUD and advanced medical gauntlets."
+ rules = "Tap this card: Re-equip 'DeForest Medical Corporation 'Lifesaver' Carapace' on a different friendly creature"
+ icon_state = "cmo_hardsuit"
+
+ mana_cost = 3
+ attack = 1
+ health = 3
+
+ faction = "Command"
+ rarity = "Rare"
+ card_type = "Equipment"
+
+/datum/tcg_card/pack_1/hos
+ name = "Head of Security"
+ desc = "Nanotrasen hires most heads of staff based on their qualifications as being amicable, good at conflict resolution, ability to handle high-stakes situations, humanity, and desire to learn. Heads of Security only need a highschool degree."
+ rules = "Human. All opponent's cards cost 1 more until Head Of Security is removed from the battlefield."
+ icon_state = "hos"
+
+ mana_cost = 7
+ attack = 4
+ health = 4
+
+ faction = "Command"
+ rarity = "Rare"
+ card_type = "Unit"
+
+/datum/tcg_card/pack_1/hos_suit
+ name = "Apadyne Technologies 'Tyrant' Class Hardshell"
+ desc = "The distinctive shape of the Tyrant Class Hardshell is caused, in part, by the large amount of kevlar reinforcement and the ablative armour layer. Perhaps more importantly, it also looks rad."
+ rules = "Grant the equipped card Fury."
+ icon_state = "hos_hardsuit"
+
+ mana_cost = 6
+ attack = 4
+ health = 2
+
+ faction = "Command"
+ rarity = "Epic"
+ card_type = "Equipment"
+
+/datum/tcg_card/pack_1/ce
+ name = "Chief Engineer"
+ desc = "The Chief Engineer is in charge of keeping the station powered and intact. Most of CE's usually fail this task."
+ rules = "Human. Protect a friendly card from one spell."
+ icon_state = "ce"
+
+ mana_cost = 6
+ attack = 3
+ health = 6
+
+ faction = "Command"
+ rarity = "Rare"
+ card_type = "Unit"
+
+/datum/tcg_card/pack_1/ce_suit
+ name = "Nakamura Engineering R.I.G.Suit (Advanced)"
+ desc = "An updated version of Nakamura Engineering's R.I.G.Suit fitted with advanced radiation shielding and extra armour."
+ rules = "On equip: Equipped creature is protected from one spell."
+ icon_state = "ce_hardsuit"
+
+ mana_cost = 3
+ attack = 0
+ health = 3
+
+ faction = "Command"
+ rarity = "Rare"
+ card_type = "Equipment"
+
+/datum/tcg_card/pack_1/rd
+ name = "Research Director"
+ desc = "The Research Director is the head of the Science Division and is responsible for shockingly directing research."
+ rules = "Human. All Science card activate their effects twice."
+ icon_state = "rd"
+
+ mana_cost = 7
+ attack = 2
+ health = 5
+
+ faction = "Command"
+ rarity = "Common"
+ card_type = "Unit"
+
+/datum/tcg_card/pack_1/rd_suit
+ name = "Nakamura Engineering B.O.M.B.Suit"
+ desc = "The Nakamura Engineering B.O.M.B.Suit is an innovative combination of a R.I.G.Suit and a bomb suit perfect for toxins research."
+ rules = "Reduces all incoming damage for 1. Does not work if damage is lethal."
+ icon_state = "rd_hardsuit"
+
+ mana_cost = 3
+ attack = 0
+ health = 0
+
+ faction = "Command"
+ rarity = "Rare"
+ card_type = "Equipment"
+
+
+//COMMAND END
+
+//SILICONS
+
+/datum/tcg_card/pack_1/ai
+ name = "AI"
+ desc = "The latest generation of NT's top secret artificial intelligence project this time with actual human brains in a jar! Don't tell the press though."
+ rules = "Asimov. All silicon cards gain +1/0 while this creature is alive."
+ icon_state = "ai"
+
+ mana_cost = 5
+ attack = 3
+ health = 6
+
+ faction = "Silicon"
+ rarity = "Epic"
+ card_type = "Unit"
+
+/datum/tcg_card/pack_1/pai
+ name = "Personal AI Device"
+ desc = "Personal AI Devices are able to take the form of many household pets to provide a homely sense of comfort and companionship to their owners."
+ rules = "Asimov. Taunt."
+ icon_state = "pai"
+
+ mana_cost = 2
+ attack = 1
+ health = 1
+
+ faction = "Silicon"
+ rarity = "Common"
+ card_type = "Unit"
+
+/datum/tcg_card/pack_1/cyborg
+ name = "Cyborg"
+ desc = "Created as part of humanity's first foray into artificial intelligence the original cyborg models used organic parts in lieu of sophisticated artificial brains."
+ rules = "Asimov."
+ icon_state = "borg_basic"
+
+ mana_cost = 2
+ attack = 3
+ health = 3
+
+ faction = "Silicon"
+ rarity = "Common"
+ card_type = "Unit"
+
+/datum/tcg_card/pack_1/cyborg_clown
+ name = "Cyborg (Clown Shell)"
+ desc = "The clown shell is a new development in cyborg technology designed to capture the joyous hijinks of the station clown in a notably more macabre and disturbing fashion."
+ rules = "Asimov. Taunt."
+ icon_state = "borg_clown"
+
+ mana_cost = 2
+ attack = 2
+ health = 4
+
+ faction = "Silicon"
+ rarity = "Common"
+ card_type = "Unit"
+
+/datum/tcg_card/pack_1/cyborg_engi
+ name = "Cyborg (Engineering Shell)"
+ desc = "A common sight on Nanotrasen Stations Engineering Shells maintain critical station systems in hazardous conditions."
+ rules = "Asimov."
+ icon_state = "borg_engi"
+
+ mana_cost = 2
+ attack = 4
+ health = 2
+
+ faction = "Silicon"
+ rarity = "Rare"
+ card_type = "Unit"
+
+/datum/tcg_card/pack_1/cyborg_sec
+ name = "Cyborg (Security Shell)"
+ desc = "Following an incident in 2554 the Security Cyborg Shell was unilaterally phased out and replaced by the Peacekeeper. Nonetheless many units remain in service with various other organisations such as private militaries."
+ rules = "Asimov. Can attack humans, but deals only 1 damage."
+ icon_state = "borg_sec"
+
+ mana_cost = 6
+ attack = 4
+ health = 2
+
+ faction = "Silicon"
+ rarity = "Rare"
+ card_type = "Unit"
+
+/datum/tcg_card/pack_1/cyborg_sec
+ name = "Cyborg (Peacekeeper Shell)"
+ desc = "After the unilateral phasing out of Security Shells in 2554 following mass reports of cyborg-on-human violence the Peacekeeper Shell was introduced as a stopgap solution until the problems could be resolved."
+ rules = "Asimov. Tap this card: Restore 2 health for a friendly creature."
+ icon_state = "borg_peace"
+
+ mana_cost = 2
+ attack = 4
+ health = 3
+
+ faction = "Silicon"
+ rarity = "Common"
+ card_type = "Unit"
+
+/datum/tcg_card/pack_1/cyborg_med
+ name = "Cyborg (Medical Shell)"
+ desc = "A state of the art medical shell for when biological life just can't take care of itself. Comes equipped with built-in surgical equipment and all the medicated lollipops you could ever want."
+ rules = "Asimov. Loses 1 power for every Human on opponent's field."
+ icon_state = "borg_med"
+
+ mana_cost = 2
+ attack = 4
+ health = 3
+
+ faction = "Silicon"
+ rarity = "Common"
+ card_type = "Unit"
+
+/datum/tcg_card/pack_1/cyborg_service
+ name = "Cyborg (Service Shell)"
+ desc = "Sometimes a cyborg just needs to show a bit of flamboyance you know?"
+ rules = "Asimov. Gains +2/+2 when it's the only card on your field."
+ icon_state = "borg_service"
+
+ mana_cost = 1
+ attack = 0
+ health = 1
+
+ faction = "Silicon"
+ rarity = "Common"
+ card_type = "Unit"
+
+/datum/tcg_card/pack_1/cyborg_janitor
+ name = "Cyborg (Custodial Shell)"
+ desc = "A powerful state of the act cleaning machine. They exist to eradicate stains snag garbage and replace lights forever. We are legally obligated by the Janitor's Union to state that these machines are no replacement for a flesh-and-blood janitor."
+ rules = "Asimov. After tapping this card, tap an opponent's Human card as well."
+ icon_state = "borg_janitor"
+
+ mana_cost = 2
+ attack = 1
+ health = 3
+
+ faction = "Silicon"
+ rarity = "Common"
+ card_type = "Unit"
+
+/datum/tcg_card/pack_1/cyborg_miner
+ name = "Cyborg (Mining Shell)"
+ desc = "Fitted with a drill and tracks the Mining Shell is designed to hold up to the rigours of mining be that on the hellish surface of Indecipheres or in the silent vacuum of the asteroid belt."
+ rules = "Asimov. Gain 1 additional mana every turn."
+ icon_state = "borg_miner"
+
+ mana_cost = 2
+ attack = 3
+ health = 1
+
+ faction = "Silicon"
+ rarity = "Rare"
+ card_type = "Unit"
+
+//SILICONS END
+
+//CIVILIANS
+
+/datum/tcg_card/pack_1/assistant
+ name = "Assistant"
+ desc = "The lowest ladder on the Nanotrasen Employment Ladder, Assistants are employed to help out with tasks deemed 'too menial for robots'."
+ rules = "Greytide."
+ icon_state = "assistant"
+
+ mana_cost = 1
+ attack = 1
+ health = 1
+
+ faction = "Civilian"
+ rarity = "Common"
+ card_type = "Unit"
+
+/datum/tcg_card/pack_1/greytider
+ name = "Greytider"
+ desc = "The lowest ladder on the Nanotrasen Employment Ladder, Assistants are employed to help out with tasks deemed 'too menial for robots'."
+ rules = "Greytide. Instead of getting +1/+1 on the first turn, get it permanently."
+ icon_state = "greytider"
+
+ mana_cost = 1
+ attack = 2
+ health = 1
+
+ faction = "Civilian"
+ rarity = "Rare"
+ card_type = "Unit"
+
+/datum/tcg_card/pack_1/bartender
+ name = "Bartender"
+ desc = "Prior to the introduction of on-station psychologists the Bartender served to alleviate many employees' woes and fears. Remember always drink responsibly."
+ rules = ""
+ icon_state = "bartender"
+
+ mana_cost = 3
+ attack = 3
+ health = 2
+
+ faction = "Civilian"
+ rarity = "Common"
+ card_type = "Unit"
+
+/datum/tcg_card/pack_1/botanist
+ name = "Botanist"
+ desc = "The Botanist is in charge of keeping the station's food supply happy healthy and preferably not laced with hallucinogens."
+ rules = ""
+ icon_state = "botanist"
+
+ mana_cost = 1
+ attack = 1
+ health = 4
+
+ faction = "Civilian"
+ rarity = "Common"
+ card_type = "Unit"
+
+/datum/tcg_card/pack_1/botanist
+ name = "Botanist"
+ desc = "The Botanist is in charge of keeping the station's food supply happy healthy and preferably not laced with hallucinogens."
+ rules = ""
+ icon_state = "botanist"
+
+ mana_cost = 1
+ attack = 1
+ health = 4
+
+ faction = "Civilian"
+ rarity = "Common"
+ card_type = "Unit"
+
+/datum/tcg_card/pack_1/chaplain
+ name = "Chaplain"
+ desc = "Every station should have it's own chaplain for religious purposes. Keyword is 'Should'."
+ rules = "Holy"
+ icon_state = "chaplain"
+
+ mana_cost = 2
+ attack = 2
+ health = 3
+
+ faction = "Civilian"
+ rarity = "Common"
+ card_type = "Unit"
+
+/datum/tcg_card/pack_1/inquisitor
+ name = "Inquisitor's Hardsuit"
+ desc = "Nanotrasen officially doesn't believe in ghosts magic or anything that can't be solved with science. When you see someone show up in one of these let that remind you of that fact."
+ rules = "Holy. First Strike."
+ icon_state = "inquisitor"
+
+ mana_cost = 4
+ attack = 2
+ health = 2
+
+ faction = "Civilian"
+ rarity = "Epic"
+ card_type = "Equipment"
+
+/datum/tcg_card/pack_1/janitor
+ name = "Janitor"
+ desc = "A true testament to futility they clean and they clean and they clean knowing that there's no way they can clean it all. Yet they perservere knowing that without them the crew would simply give in to their base animalistic nature."
+ rules = "Taunt"
+ icon_state = "janitor"
+
+ mana_cost = 1
+ attack = 1
+ health = 1
+
+ faction = "Civilian"
+ rarity = "Common"
+ card_type = "Unit"
+
+/datum/tcg_card/pack_1/lawyer
+ name = "Lawyer"
+ desc = "Nanotrasen knows the value of a good lawyer. That's why they're all working hard at our home offices defending us from frivolous labor suits from lazy no-good employees who should be working hard instead of slacking off reading trading cards."
+ rules = "When an opponent attacks with a creature with 3 or more power this card gains Taunt."
+ icon_state = "lawyer"
+
+ mana_cost = 2
+ attack = 0
+ health = 4
+
+ faction = "Civilian"
+ rarity = "Common"
+ card_type = "Unit"
+
+/datum/tcg_card/pack_1/clown
+ name = "Clown"
+ desc = "Every Nanotrasen station has a clown on board as high command believes that a source of entertainment will reduce instances of murder-suicide on board Spinward Stations. The results of this hypothesis are as of yet unproven."
+ rules = "Taunt. When killed, attacking creature dies as well"
+ icon_state = "clown"
+
+ mana_cost = 3
+ attack = 2
+ health = 4
+
+ faction = "Civilian"
+ rarity = "Rare"
+ card_type = "Unit"
+
+/datum/tcg_card/pack_1/clown_hardsuit
+ name = "HONK Ltd. Entertainment Voidsuit"
+ desc = "The most advanced clown suit produced by HONK Ltd. the Entertainment Voidsuit is designed to withstand extreme conditions while still maintaining the aesthetic expected of clowns."
+ rules = "Give the equipped unit Taunt."
+ icon_state = "clown_hardsuit"
+
+ mana_cost = 2
+ attack = 1
+ health = 5
+
+ faction = "Civilian"
+ rarity = "Legendary"
+ card_type = "Equipment"
+
+/datum/tcg_card/pack_1/mime
+ name = "Mime"
+ desc = "Si vous regardez attentivement dans les yeux d'un mime vous pouvez voir le tourment sans fin derrière leur façade silencieuse. C'est vraiment tragique."
+ rules = "Tap this card: Pick an opponent's card and nullify it's effect until it leaves play."
+ icon_state = "mime"
+
+ mana_cost = 1
+ attack = 2
+ health = 1
+
+ faction = "Civilian"
+ rarity = "Rare"
+ card_type = "Unit"
+
+/datum/tcg_card/pack_1/cook
+ name = "Cook"
+ desc = "Every Nanotrasen chef is trained in 3 cuisines of their choosing upon being hired alongside the closely guarded secret of Close Quarters Cooking."
+ rules = "First Strike. When attacked, gain +1/0."
+ icon_state = "cook"
+
+ mana_cost = 3
+ attack = 3
+ health = 2
+
+ faction = "Civilian"
+ rarity = "Common"
+ card_type = "Unit"
+
+/datum/tcg_card/pack_1/curator
+ name = "Curator"
+ desc = "In Nanotrasen polls the Curator has ranked as the most pointless job on station much to the ire of the Curator's union. Thankfully we don't have to listen to them."
+ rules = "On Summon: Draw a card. If it's a spell, discard it."
+ icon_state = "curator"
+
+ mana_cost = 2
+ attack = 1
+ health = 1
+
+ faction = "Civilian"
+ rarity = "Common"
+ card_type = "Unit"
+
+/datum/tcg_card/pack_1/ian
+ name = "Ian"
+ desc = "This adorable corgi has become the defacto mascot of the Spinward Stations to many. He comes in many forms many sizes and many shapes but he's still just as lovable. Hand wash only."
+ rules = "Holy. Taunt."
+ icon_state = "ian"
+
+ mana_cost = 3
+ attack = 0
+ health = 2
+
+ faction = "Civilian"
+ rarity = "Rare"
+ card_type = "Unit"
+
+//CIVILIAN END
+
+//SECURITY
+
+/datum/tcg_card/pack_1/sec_officer
+ name = "Security Officer"
+ desc = "Nanotrasen would like to remind all employees to support their station security team; remember the boys in red keep you safe!"
+ rules = "Squad Tactics."
+ icon_state = "officer"
+
+ mana_cost = 3
+ attack = 2
+ health = 2
+
+ faction = "Security"
+ rarity = "Common"
+ card_type = "Unit"
+
+/datum/tcg_card/pack_1/warden
+ name = "Warden"
+ desc = "The Warden is tasked with the herculean (and futile) feat of defending the armory and brig and never leaving his post no matter the situation."
+ rules = "Squad Tactics. Blocker."
+ icon_state = "warden"
+
+ mana_cost = 4
+ attack = 2
+ health = 4
+
+ faction = "Security"
+ rarity = "Rare"
+ card_type = "Unit"
+
+/datum/tcg_card/pack_1/detective
+ name = "Security Officer"
+ desc = "Nanotrasen hires nothing but the best detectives to investigate crime on our stations. A penchant for cigarettes and outdated fashion isn't mandatory but is appreciated."
+ rules = "Deadeye."
+ icon_state = "detective"
+
+ mana_cost = 5
+ attack = 3
+ health = 2
+
+ faction = "Security"
+ rarity = "Common"
+ card_type = "Unit"
+
+/datum/tcg_card/pack_1/officer_ethereal
+ name = "Security Officer(Ethereal)"
+ desc = "A trained officer with BlueShift equipment. Wait, is he a red boy or a blue boy?"
+ rules = "Squad Tactics. On summon: This character can't be attacked for the first turn."
+ icon_state = "officer_ethereal"
+
+ mana_cost = 6
+ attack = 4
+ health = 4
+
+ faction = "Security"
+ rarity = "Rare"
+ card_type = "Unit"
+
+//SECURITY END
+
+//RESEARCH AND DEVELOPMENT
+
+/datum/tcg_card/pack_1/scientist
+ name = "Scientist"
+ desc = "Rumours that Nanotrasen hires 'mad scientists' are greatly exaggerated. Scientists are regularly screened to ensure that their insanity remains within acceptable limits."
+ rules = "When this card is targeted by an opponent's single target spell you gain 1 lifeshard."
+ icon_state = "scientist"
+
+ mana_cost = 4
+ attack = 1
+ health = 2
+
+ faction = "Research"
+ rarity = "Common"
+ card_type = "Unit"
+
+/datum/tcg_card/pack_1/scientist_moth
+ name = "Scientist(Moth)"
+ desc = "Moths are a common sight in Nanotrasen research departments acting as integral ideas guys for new clothing designs and lighting innovations."
+ rules = ""
+ icon_state = "scientist_moth"
+
+ mana_cost = 1
+ attack = 2
+ health = 2
+
+ faction = "Research"
+ rarity = "Common"
+ card_type = "Unit"
+
+/datum/tcg_card/pack_1/roboticist
+ name = "Roboticist"
+ desc = "The roboticist's work is as close as Nanotrasen legally allows its employees to come to necromancy."
+ rules = "If a Asimov card on your side of the field is destroyed you may pay 2 mana and tap this card: Return that card to your hand."
+ icon_state = "roboticist"
+
+ mana_cost = 3
+ attack = 2
+ health = 2
+
+ faction = "Research"
+ rarity = "Rare"
+ card_type = "Unit"
+
+/datum/tcg_card/pack_1/monkey
+ name = "Monkey"
+ desc = "Nanotrasen seeks to phase out animal testing by 2570 in accordance with new TerraGov legislation. This will be replaced with more ethical solutions such as computer simulations or experimentation on Assistants."
+ rules = "Greytide. This card is considered Human with a Geneticist on your side of the field."
+ icon_state = "monkey"
+
+ mana_cost = 1
+ attack = 1
+ health = 1
+
+ faction = "Research"
+ rarity = "Common"
+ card_type = "Unit"
+
+/datum/tcg_card/pack_1/geneticist
+ name = "Geneticist"
+ desc = "Geneticists are tasked with manipulating human DNA to produce special effects. Nanotrasen maintains a strict 'no superhero' policy for mutations following the Superhero Civil War of 2150."
+ rules = "Tap this card and pay 3 mana: Give a friendly creature Human until this card leaves the field."
+ icon_state = "geneticist"
+
+ mana_cost = 3
+ attack = 3
+ health = 4
+
+ faction = "Research"
+ rarity = "Common"
+ card_type = "Unit"
+
+/datum/tcg_card/pack_1/borgi
+ name = "Borgi Ian"
+ desc = "While Ian's cyborg costume is very convincing we at the NTED would like to remind all employees that Ian has not been experimented on."
+ rules = "Asimov. You may sacrifice this card in play: Summon a Silicon type card from your hand worth up to double this card's cost."
+ icon_state = "ian_robot"
+
+ mana_cost = 2
+ attack = 0
+ health = 3
+
+ faction = "Research"
+ rarity = "Rare"
+ card_type = "Unit"
+
+//SCIENCE END
+
+//MEDICAL
+
+/datum/tcg_card/pack_1/doctor
+ name = "Medical Doctor"
+ desc = "Nanotrasen's doctors are well known for their ability to treat almost any ailment known to mankind... as well as causing a fair few in the process."
+ rules = "Tap this card: Select a card that has less attack than this card from your graveyard and summon it to your side of the field."
+ icon_state = "doctor"
+
+ mana_cost = 3
+ attack = 2
+ health = 3
+
+ faction = "Medical"
+ rarity = "Common"
+ card_type = "Unit"
+
+/datum/tcg_card/pack_1/runtime
+ name = "Runtime"
+ desc = "Runtime is the CMO's personal feline companion and is well known for her laziness. It's said that opening a tin of tuna anywhere on the station will bring her running."
+ rules = "You may sacrifice this card: reduce the cost of summoning a Medical card this turn by 2 mana."
+ icon_state = "runtime"
+
+ mana_cost = 3
+ attack = 0
+ health = 1
+
+ faction = "Medical"
+ rarity = "Rare"
+ card_type = "Unit"
+
+/datum/tcg_card/pack_1/chemist
+ name = "Chemist"
+ desc = "Chemists are encouraged to not set up illicit methamphetamine factories on the company's dime."
+ rules = "Tap this card: flip a coin. If heads: a friendly Medical card gains 0/+2. If tails an opponents unit of your choice gains +2/0."
+ icon_state = "chemist"
+
+ mana_cost = 2
+ attack = 0
+ health = 3
+
+ faction = "Medical"
+ rarity = "Rare"
+ card_type = "Unit"
+
+/datum/tcg_card/pack_1/virologist
+ name = "Virologist"
+ desc = "Officially the virologist is present on station to deal with novel diseases and ailments that originate from deep space. As everyone knows this is not what the virologist actually does."
+ rules = ""
+ icon_state = "virologist"
+
+ mana_cost = 3
+ attack = 5
+ health = 1
+
+ faction = "Medical"
+ rarity = "Common"
+ card_type = "Unit"
+
+/datum/tcg_card/pack_1/paramedic
+ name = "Paramedic"
+ desc = "Nanotrasen encourages all paramedics to think of others before themselves- if this means running through a plasma fire to save a colleague so be it."
+ rules = "Taunt, First Strike"
+ icon_state = "paramedic"
+
+ mana_cost = 3
+ attack = 2
+ health = 3
+
+ faction = "Medical"
+ rarity = "Common"
+ card_type = "Unit"
+
+//MEDICAL END
+
+//ENGINEERING
+
+/datum/tcg_card/pack_1/engineer
+ name = "Station Engineer"
+ desc = "Station Engineers maintain the intricate and delicate web of machinery that keeps you and everyone else aboard your station alive. No pressure there then."
+ rules = "Tap this card: Reduce the first hit taken by an ally to zero."
+ icon_state = "engineer"
+
+ mana_cost = 4
+ attack = 2
+ health = 2
+
+ faction = "Engineering"
+ rarity = "Common"
+ card_type = "Unit"
+
+/datum/tcg_card/pack_1/engi_hardsuit
+ name = "Nakamura Engineering's R.I.G.Suit"
+ desc = "Nakamura Engineering's R.I.G. is a hardsuit, specifically designed for engineers working in hostile enviroments. It features good armor and is rad-proof."
+ rules = ""
+ icon_state = "engineer_hardsuit"
+
+ mana_cost = 2
+ attack = 0
+ health = 3
+
+ faction = "Engineering"
+ rarity = "Common"
+ card_type = "Equipment"
+
+/datum/tcg_card/pack_1/engineer_plasmaman
+ name = "Station Engineer (Plasmaman)"
+ desc = "The ever industrious plasmamen are well suited to engineering work due to their natural radiation resistance."
+ rules = "Immune to all spells except Security and Syndicate ones."
+ icon_state = "engineer_plasmeme"
+
+ mana_cost = 5
+ attack = 2
+ health = 4
+
+ faction = "Engineering"
+ rarity = "Rare"
+ card_type = "Unit"
+
+/datum/tcg_card/pack_1/atmos_tech
+ name = "Atmospheric Technician"
+ desc = "The Atmospheric Technicians are tasked with keeping the station's air clean breathable and most importantly devoid of plasma."
+ rules = "On Summon: Search your deck for an Engineering Spell card and add it to your hand. Shuffle your deck afterward."
+ icon_state = "atmos_tech"
+
+ mana_cost = 4
+ attack = 2
+ health = 3
+
+ faction = "Engineering"
+ rarity = "Common"
+ card_type = "Unit"
+
+/datum/tcg_card/pack_1/atmos_hardsuit
+ name = "Nakamura Atmospherics's R.I.G.Suit"
+ desc = "Nakamura Atmospherics's R.I.G. is just an old modified Engineering R.I.G.Suit that lacks rad-protection. Some technicans painted it blue and now it's 'fireproof'."
+ rules = "Equipped creature gains immunity to engineering spells."
+ icon_state = "atmos_tech_hardsuit"
+
+ mana_cost = 2
+ attack = 0
+ health = 2
+
+ faction = "Engineering"
+ rarity = "Rare"
+ card_type = "Equipment"
+
+//ENGINEERING END
+
+//CARGO
+
+/datum/tcg_card/pack_1/cargo_tech
+ name = "Cargo Technician"
+ desc = "The grunts of Cargo. Any reports that Cargo Technicians are frequently overcome by revolutionary fervour are exaggerated."
+ rules = "Once per turn: Give this card -1/0 and gain 1 mana."
+ icon_state = "cargo_tech"
+
+ mana_cost = 2
+ attack = 3
+ health = 1
+
+ faction = "Cargo"
+ rarity = "Common"
+ card_type = "Unit"
+
+/datum/tcg_card/pack_1/shaft_miner
+ name = "Shaft Miner"
+ desc = "When the station needs materials these are the guys who risk their lives bravely pioneering the wastes of Indecipheres to bring them in."
+ rules = "Tap this card: Draw one card. If it's not a spell, discard it."
+ icon_state = "miner"
+
+ mana_cost = 6
+ attack = 6
+ health = 4
+
+ faction = "Cargo"
+ rarity = "Rare"
+ card_type = "Unit"
+
+/datum/tcg_card/pack_1/citrus
+ name = "Citrus"
+ desc = "Cargo's happy sloth pal. Known for his cute sweater and always getting in the way."
+ rules = "Taunt. Tap this card: Tap an opponent's card until the start of your next turn."
+ icon_state = "citrus"
+
+ mana_cost = 2
+ attack = 0
+ health = 3
+
+ faction = "Cargo"
+ rarity = "Common"
+ card_type = "Unit"
+
+/datum/tcg_card/pack_1/quartermaster
+ name = "Quartermaster"
+ desc = "Every Nanotrasen station has a Quartermaster who controls the flow of cargo to and from the station and by extension to and from the hands of the crew. He's not given the distinction of being a head though. His job isn't hard enough."
+ rules = "Permanently tap this card. All cargo cards on your side gain +2/+2 until this card leaves the play."
+ icon_state = "quartermaster"
+
+ mana_cost = 10
+ attack = 4
+ health = 4
+
+ faction = "Cargo"
+ rarity = "Rare"
+ card_type = "Unit"
+
+/datum/tcg_card/pack_1/explorer
+ name = "Explorer"
+ desc = "The Nanotrasen Explorers Corps boldly goes where humanity has never gone before. Or would if they weren't buried under mounds of bureaucracy."
+ rules = "Tap this card: Flip a coin if heads gain 4 mana this turn, if tails tap this card for 2 turns."
+ icon_state = "explorer"
+
+ mana_cost = 2
+ attack = 3
+ health = 3
+
+ faction = "Cargo"
+ rarity = "Legendary"
+ card_type = "Unit"
+
+//CARGO END
+
+//CENTCOM
+
+/datum/tcg_card/pack_1/intern
+ name = "Intern"
+ desc = "All Nanotrasen interns come with 3 things: A resume a desire to learn and vague promises that they're getting paid at some point. So don't be too rough on them."
+ rules = "First Strike. Greytide."
+ icon_state = "intern"
+
+ mana_cost = 1
+ attack = 1
+ health = 1
+
+ faction = "Centcom"
+ rarity = "Common"
+ card_type = "Unit"
+
+/datum/tcg_card/pack_1/ert_command
+ name = "NT P.A.V. Suit (Command)"
+ desc = "Issued to members of Emergency Response Teams the P.A.V. Suit gives superior protection from any threat the galaxy can throw at it. This particular model is outfitted with a sidearm holster and a sleek blue finish."
+ rules = "While equipped give the equipped unit Squad Tactics and First Strike."
+ icon_state = "ert_command"
+
+ mana_cost = 2
+ attack = 2
+ health = 2
+
+ faction = "Centcom"
+ rarity = "Epic"
+ card_type = "Equipment"
+
+/datum/tcg_card/pack_1/ert_sec
+ name = "NT P.A.V. Suit (Security)"
+ desc = "Issued to members of Emergency Response Teams the P.A.V. Suit gives superior protection from any threat the galaxy can throw at it. This particular model is outfitted with bulletproof padding and an intimidating red finish."
+ rules = "While equipped give the equipped unit Squad Tactics."
+ icon_state = "ert_sec"
+
+ mana_cost = 2
+ attack = 2
+ health = 1
+
+ faction = "Centcom"
+ rarity = "Rare"
+ card_type = "Equipment"
+
+/datum/tcg_card/pack_1/ert_med
+ name = "NT P.A.V. Suit (Medical)"
+ desc = "Issued to members of Emergency Response Teams the P.A.V. Suit gives superior protection from any threat the galaxy can throw at it. This particular model is outfitted with a sterile coating and a calming white finish."
+ rules = "While equipped give the equipped unit Squad Tactics."
+ icon_state = "ert_med"
+
+ mana_cost = 2
+ attack = 1
+ health = 2
+
+ faction = "Centcom"
+ rarity = "Common"
+ card_type = "Equipment"
+
+/datum/tcg_card/pack_1/ert_engi
+ name = "NT P.A.V. Suit (Engineering)"
+ desc = "Issued to members of Emergency Response Teams the P.A.V. Suit gives superior protection from any threat the galaxy can throw at it. This particular model is outfitted with a welding screen and a flashy yellow finish."
+ rules = "While equipped give the equipped unit Squad Tactics."
+ icon_state = "ert_engi"
+
+ mana_cost = 1
+ attack = 1
+ health = 2
+
+ faction = "Centcom"
+ rarity = "Common"
+ card_type = "Equipment"
+
+/datum/tcg_card/pack_1/deathsquad
+ name = "Deathsquad Officer"
+ desc = "There were rumors about 'Deathsquads' killing station where something horrible happened, but we remind you that's it's just a lie."
+ rules = "Taunt. First Strike."
+ icon_state = "deathsquad"
+
+ mana_cost = 8
+ attack = 8
+ health = 6
+
+ faction = "Centcom"
+ rarity = "Epic"
+ card_type = "Unit"
+
+//CENTCOM END
+
+//ANTAGONISTS
+
+/datum/tcg_card/pack_1/changeling
+ name = "Armored Changeling"
+ desc = "The strange creatures known as changelings have been known to develop natural armour as a defense mechanism when in combat."
+ rules = "Changeling."
+ icon_state = "changeling"
+
+ mana_cost = 6
+ attack = 2
+ health = 8
+
+ faction = "Syndicate"
+ rarity = "Rare"
+ card_type = "Unit"
+
+/datum/tcg_card/pack_1/chrono_legionare
+ name = "Chrono Legionare"
+ desc = "Currently in the earliest stages of development the Chrono Legionnaire project is expected to weaponise time itself."
+ rules = "If this card is destroyed or discarded flip 3 coins. If the result has 2 or more heads add this card back to your hand. Otherwise send it to your graveyard."
+ icon_state = "chrono_legionare"
+
+ mana_cost = 4
+ attack = 6
+ health = 2
+
+ faction = "Syndicate"
+ rarity = "Epic"
+ card_type = "Unit"
+
+/datum/tcg_card/pack_1/abductor_armor
+ name = "Combat Abductor Armor"
+ desc = "Recovered from the strange alien species known as the Abductors this armour is made from an extremely tough yet flexible material that has been dubbed as Alien Alloy by researchers."
+ rules = "Give equipped unit immunity to spells for 3 turns. Unequipped after 3 turns."
+ icon_state = "abductor"
+
+ mana_cost = 6
+ attack = 1
+ health = 2
+
+ faction = "Syndicate"
+ rarity = "Common"
+ card_type = "Equipment"
+
+/datum/tcg_card/pack_1/wizard
+ name = "Wizard"
+ desc = "A strange men(or golem) wearing blue robes. For some reason, he looks like a total nerd."
+ rules = "Flip a coin every turn. If tails, deal 2 damage to any enemy unit except Holy ones. If heads, deal 2 damage to self."
+ icon_state = "wizard"
+
+ mana_cost = 8
+ attack = 6
+ health = 4
+
+ faction = "Syndicate"
+ rarity = "Rare"
+ card_type = "Unit"
+
+/datum/tcg_card/pack_1/abductor_armor
+ name = "Wizard Federation Standard Issue Hardsuit"
+ desc = "Seemingly reverse engineered from captured engineering hardsuits the iconic Wizard Federation Hardsuit is a spectacular melding of technology and magic."
+ rules = "On Equip: The equipped creature cannot attack targets with Holy."
+ icon_state = "wizard_hardsuit"
+
+ mana_cost = 1
+ attack = 3
+ health = 1
+
+ faction = "Syndicate"
+ rarity = "Rare"
+ card_type = "Equipment"
+
+/datum/tcg_card/pack_1/swarmer
+ name = "Swarmer"
+ desc = "Leading researchers theorise that Swarmers were designed as some kind of vanguard for an alien invasion force which seemingly has never materialised."
+ rules = "Greytide."
+ icon_state = "swarmer"
+
+ mana_cost = 1
+ attack = 1
+ health = 1
+
+ faction = "Syndicate"
+ rarity = "Common"
+ card_type = "Unit"
+
+/datum/tcg_card/pack_1/swarmer_beacon
+ name = "Swarmer Beacon"
+ desc = "A strange device that can construct swarmers."
+ rules = "Every turn: Draw a card. If it's a Swarmer, play it for free. Else, discard it."
+ icon_state = "swarmer_beacon"
+
+ mana_cost = 4
+ attack = 0
+ health = 1
+
+ faction = "Syndicate"
+ rarity = "Epic"
+ card_type = "Unit"
+
+/datum/tcg_card/pack_1/nukie
+ name = "Nuclear Operative"
+ desc = "The frontline grunts of the syndicate army Nuclear Operatives are typically well trained and equipped for their grim duty."
+ rules = "Squad Tactics."
+ icon_state = "nukie"
+
+ mana_cost = 4
+ attack = 4
+ health = 2
+
+ faction = "Syndicate"
+ rarity = "Rare"
+ card_type = "Unit"
+
+/datum/tcg_card/pack_1/nukie_elite
+ name = "Elite Syndicate Nuclear Stormtrooper"
+ desc = "The best of the best of the syndicate troops elite stormtroopers can be distinguished by their black armour. Shoot on sight ask questions later!"
+ rules = "Squad Tactics. Fury."
+ icon_state = "nukie_elite"
+
+ mana_cost = 7
+ attack = 5
+ health = 5
+
+ faction = "Syndicate"
+ rarity = "Epic"
+ card_type = "Unit"
+
+/datum/tcg_card/pack_1/clockwork_cultist
+ name = "Ratvarian Clockwork Cuirass"
+ desc = "Fashioned from paranormally reinforced brass the Ratvar Cult's clockwork armour is as beautiful as it is heretical."
+ rules = "While equipped give the equipped unit Clockwork."
+ icon_state = "clockwork_cultist"
+
+ mana_cost = 4
+ attack = 2
+ health = 2
+
+ faction = "Syndicate"
+ rarity = "Rare"
+ card_type = "Equipment"
+
+/datum/tcg_card/pack_1/revenant
+ name = "Revenant"
+ desc = "The revenant is a spirit of pure hatred kept alive by drawing the life force of its enemies."
+ rules = "When a unit on dies Revenant gains 1/0."
+ icon_state = "revenant"
+
+ mana_cost = 3
+ attack = 2
+ health = 3
+
+ faction = "Syndicate"
+ rarity = "Common"
+ card_type = "Unit"
+
+/datum/tcg_card/pack_1/angry_slime
+ name = "Crazy Slime"
+ desc = "An agressive slime who seeks blood. You totally should extinguish him."
+ rules = "When attacking, search your deck for Crazy Slime and add it to your hand. Shuffle your deck afterwards."
+ icon_state = "angry_slime"
+
+ mana_cost = 2
+ attack = 1
+ health = 1
+
+ faction = "Syndicate"
+ rarity = "Common"
+ card_type = "Unit"
+
+//ANTAGONISTS END
+
+//SPELLS
+
+/datum/tcg_card/pack_1/adrenals
+ name = "Adrenals"
+ desc = "A potent mixture of stimulants designed to enhance a soldier's ability in the field. Technically illegal in Terragov territory but since when has that stopped anyone?"
+ rules = "Grant +2/+1 to a friendly unit."
+ icon_state = "adrenals"
+
+ mana_cost = 1
+
+ faction = "Medical"
+ rarity = "Common"
+ card_type = "Spell"
+
+/datum/tcg_card/pack_1/defib
+ name = "Defibrillator"
+ desc = "A device that allows to re-start hearts using electricity. It also can be used as a weapon!"
+ rules = "Resurrect a friendly unit with 1 HP."
+ icon_state = "defib"
+
+ mana_cost = 4
+
+ faction = "Medical"
+ rarity = "Rare"
+ card_type = "Spell"
+
+/datum/tcg_card/pack_1/morphine
+ name = "Morphine"
+ desc = "A sedative chemical that puts everyone who uses it into sleep."
+ rules = "Tap an enemy card without activating it's effect for 1 turn."
+ icon_state = "morphine"
+
+ mana_cost = 2
+
+ faction = "Medical"
+ rarity = "Common"
+ card_type = "Spell"
+
+/datum/tcg_card/pack_1/bluespace
+ name = "Bluespace Flux"
+ desc = "Despite being a revolutionary new technology bluespace still has some... kinks that need sorted out."
+ rules = "Active for 3 turns. Every player can pay 2 mana to draw an additional card from their deck."
+ icon_state = "bluespace"
+
+ mana_cost = 5
+
+ faction = "Research"
+ rarity = "Common"
+ card_type = "Spell"
+
+/datum/tcg_card/pack_1/bag_of_holding
+ name = "Bag Of Greed"
+ desc = "BAG OF GREED ALLOWS ME TO DRAW TWO MORE CARDS. I WILL START MY TURN BY PLAYING BAG OF GREED WHICH ALLOWS ME TO DRAW TWO MORE CARDS. I WILL PLAY THE EVENT CARD BAG OF GREED WHICH ALLOWS ME TO DRAW TWO NEW CARDS."
+ rules = "Draw 2 cards from your deck."
+ icon_state = "bag_of_holding"
+
+ mana_cost = 3
+
+ faction = "Research"
+ rarity = "Common"
+ card_type = "Spell"
+
+/datum/tcg_card/pack_1/malfunction
+ name = "Glitch in the System"
+ desc = "Even a meticulously maintained AI system will eventually develop errors. Many are benign but some may cause unforeseen problems..."
+ rules = "Remove Asimov from one of your cards."
+ icon_state = "malfunction"
+
+ mana_cost = 1
+
+ faction = "Research"
+ rarity = "Common"
+ card_type = "Spell"
+
+/datum/tcg_card/pack_1/botanist_plant
+ name = "Comitted Botanist"
+ desc = "When you've grown the plants nurtured the plants and harvested the plants there's only one place to go from there... becoming the plant."
+ rules = "Only usable when Botanist is on the field. This turn all service cards cost 2 mana less(but not below 1)."
+ icon_state = "botanist_plant"
+
+ mana_cost = 4
+
+ faction = "Service"
+ rarity = "Rare"
+ card_type = "Spell"
+
+/datum/tcg_card/pack_1/gaia
+ name = "Ambrosia Gaia"
+ desc = "If Ambrosia is the gold of Botany the rare Gaia variety is the platinum. Almost nobody has seen this illusive plant with their own eyes."
+ rules = "During the draw phase you may sacrifice Ambrosia Gaia to gain 3 mana."
+ icon_state = "gaia"
+
+ mana_cost = 0
+
+ faction = "Service"
+ rarity = "Legendary"
+ card_type = "Spell"
+
+/datum/tcg_card/pack_1/deep_fryer
+ name = "Deep Fryer"
+ desc = "God bless the United States of Space America."
+ rules = "Destroy an opponent's equipment card."
+ icon_state = "deep_fryer"
+
+ mana_cost = 2
+
+ faction = "Service"
+ rarity = "Common"
+ card_type = "Spell"
+
+/datum/tcg_card/pack_1/bepis
+ name = "B.E.P.I.S."
+ desc = "God bless the United States of Space America."
+ rules = "Flip a coin. If heads, gain 2 mana. If tails, lose 2 mana."
+ icon_state = "bepis"
+
+ mana_cost = 0
+
+ faction = "Cargo"
+ rarity = "Common"
+ card_type = "Spell"
+
+/datum/tcg_card/pack_1/economy_crash
+ name = "Economy Crash"
+ desc = "So cargo sold 20 canisters of miasma and now the galactic economy is experiencing what's known as 'a catastrophic collapse'."
+ rules = "All cards cost 1 more mana to play."
+ icon_state = "economy_crash"
+
+ mana_cost = 2
+
+ faction = "Cargo"
+ rarity = "Common"
+ card_type = "Spell"
+
+/datum/tcg_card/pack_1/additional_supplies
+ name = "Additional Supplies"
+ desc = "Well, cargonia ordered 10 crates of buckshots and slugs. Looks like we need to dispose of them quickly."
+ rules = "For 3 turns, you draw an additional page every turn."
+ icon_state = "additional_supplies"
+
+ mana_cost = 3
+
+ faction = "Cargo"
+ rarity = "Rare"
+ card_type = "Spell"
+
+/datum/tcg_card/pack_1/bsa_barrage
+ name = "BSA Barrage"
+ desc = "The officers at Centcom are well known for their ability to hit targets extremely accurately with their bluespace artillery especially when stupid pictures show up at their fax machine."
+ rules = "Destroy an opponent's unit. Deal 2 damage to all units on the field."
+ icon_state = "bsa_barrage"
+
+ mana_cost = 4
+
+ faction = "Security"
+ rarity = "Rare"
+ card_type = "Spell"
+
+/datum/tcg_card/pack_1/reeducation
+ name = "Re-education"
+ desc = "Nobody ever seems to return from re-education. Probably best not to question it."
+ rules = "Deal 4 damage to an enemy's unit."
+ icon_state = "re-education"
+
+ mana_cost = 2
+
+ faction = "Security"
+ rarity = "Common"
+ card_type = "Spell"
+
+/datum/tcg_card/pack_1/just_losses
+ name = "Justifiable Casualties"
+ desc = "The beat is hell. Officers die. The strongest they live."
+ rules = "Sacrifice two friendly creatures from the battlefield then summon a creature from your hand at no mana cost."
+ icon_state = "just_losses"
+
+ mana_cost = 2
+
+ faction = "Security"
+ rarity = "Common"
+ card_type = "Spell"
+
+/datum/tcg_card/pack_1/sleeping_carp
+ name = "Sleeping Carp"
+ desc = "Created by the long-extinct Carp Monks of Space Tibet the Sleeping Carp style has been kept alive by dedicated practitioners and even found its way into the Syndicate's training regime."
+ rules = "Give a friendly unit +3/+1. Draw an additional card every turn while they are alive."
+ icon_state = "sleeping_carp"
+
+ mana_cost = 6
+
+ faction = "Syndicate"
+ rarity = "Epic"
+ card_type = "Spell"
+
+/datum/tcg_card/pack_1/tough_choices
+ name = "Tough Choices"
+ desc = "Every Nanotrasen employee will at some point be forced to make a tough choice. Make sure you make the right one!"
+ rules = "Draw the top three cards from your deck. Summon one at no cost and discard the other two."
+ icon_state = "tough_choices"
+
+ mana_cost = 2
+
+ faction = "Syndicate"
+ rarity = "Common"
+ card_type = "Spell"
+
+/datum/tcg_card/pack_1/nuclear_explosion
+ name = "Nuclear Explosion"
+ desc = "The Gorlex Marauders are well known for their nuclear weapons and their nuke first second third and fourth policy with regards to deploying them."
+ rules = "Kill all units on the battlefield."
+ icon_state = "nuclear_explosion"
+
+ mana_cost = 5
+
+ faction = "Syndicate"
+ rarity = "Rare"
+ card_type = "Spell"
+
+/datum/tcg_card/pack_1/inducer
+ name = "Inducer"
+ desc = "The inducer is a marvelous piece of tech allowing the recharging of an internal cell without opening a machine."
+ rules = "Pay 3 lifeshards: Gain 3 mana this turn."
+ icon_state = "inducer"
+
+ mana_cost = 0
+
+ faction = "Engineering"
+ rarity = "Rare"
+ card_type = "Spell"
+
+/datum/tcg_card/pack_1/plasmafire
+ name = "Atmospherics Incident"
+ desc = "Accidents happen."
+ rules = "For 3 turns, add -1/-1 to every unit."
+ icon_state = "plasmafire"
+
+ mana_cost = 3
+
+ faction = "Engineering"
+ rarity = "Rare"
+ card_type = "Spell"
+
+/datum/tcg_card/pack_1/supermatter
+ name = "Supermatter"
+ desc = "A glowing crystal, made of hyper-pressurised plasma, widely known for it's radiation production."
+ rules = "Destroy an enemy's unit."
+ icon_state = "supermatter"
+
+ mana_cost = 4
+
+ faction = "Engineering"
+ rarity = "Rare"
+ card_type = "Spell"
diff --git a/code/modules/tcg/pack_nuclear.dm b/code/modules/tcg/pack_nuclear.dm
new file mode 100644
index 0000000000..96ec174a4b
--- /dev/null
+++ b/code/modules/tcg/pack_nuclear.dm
@@ -0,0 +1,483 @@
+/datum/tcg_card/pack_nuclear
+ pack = 'icons/obj/tcg/pack_nuclear.dmi'
+
+/datum/tcg_card/pack_nuclear/cayenne
+ name = "Cayenne"
+ desc = "A failed Syndicate experiment in weaponized space carp technology, it now serves as a lovable mascot."
+ rules = "Only playable when there are other Syndicate units on the field."
+ icon_state = "cayenne"
+
+ mana_cost = 4
+ attack = 4
+ health = 3
+
+ faction = "Syndicate"
+ rarity = "Rare"
+ card_type = "Unit"
+
+/datum/tcg_card/pack_nuclear/esword
+ name = "Energy Sword"
+ desc = "Hard-light sword that doesn't leave burns. Don't ask questions."
+ rules = ""
+ icon_state = "esword"
+
+ mana_cost = 3
+ attack = 2
+ health = 0
+
+ faction = "Syndicate"
+ rarity = "Common"
+ card_type = "Equipment"
+
+/datum/tcg_card/pack_nuclear/stechkin
+ name = "Stechkin Pistol"
+ desc = "A small, easily concealable 10mm handgun. Has a threaded barrel for suppressors."
+ rules = "When equipping this card, flip it so opponent won't see it. Flip the card after the first attack."
+ icon_state = "stechkin"
+
+ mana_cost = 2
+ attack = 2
+ health = 0
+
+ faction = "Syndicate"
+ rarity = "Common"
+ card_type = "Equipment"
+
+/datum/tcg_card/pack_nuclear/c20r
+ name = "C-20R SMG"
+ desc = "A bullpup two-round burst .45 SMG, designated 'C-20r'. Has a 'Scarborough Arms - Per falcis, per pravitas' buttstamp."
+ rules = "After attack, flip a coin. If heads, leave the weapon. If tails, unequip this card."
+ icon_state = "c20r"
+
+ mana_cost = 4
+ attack = 4
+ health = 0
+
+ faction = "Syndicate"
+ rarity = "Rare"
+ card_type = "Equipment"
+
+/datum/tcg_card/pack_nuclear/l6saw
+ name = "L6 Saw LMG"
+ desc = "A heavily modified 1.95x129mm light machine gun, designated 'L6 SAW'. Has 'Aussec Armoury - 2531' engraved on the receiver below the designation."
+ rules = "After equipped unit dies, this card goes to the bottom of draw deck"
+ icon_state = "l6saw"
+
+ mana_cost = 8
+ attack = 6
+ health = 0
+
+ faction = "Syndicate"
+ rarity = "Epic"
+ card_type = "Equipment"
+
+/datum/tcg_card/pack_nuclear/bulldog
+ name = "Bulldog Shotgun"
+ desc = "A semi-auto, mag-fed shotgun for combat in narrow corridors, nicknamed 'Bulldog' by boarding parties. Compatible only with specialized 8-round drum magazines."
+ rules = "After attack, deal 1 damage to enemy units next to the attacked one."
+ icon_state = "bulldog"
+
+ mana_cost = 3
+ attack = 3
+ health = 0
+
+ faction = "Syndicate"
+ rarity = "Rare"
+ card_type = "Equipment"
+
+/datum/tcg_card/pack_nuclear/nuke_op_leader
+ name = "Nuclear Team Commander"
+ desc = "All commanders of elite nuclear teams are equipped with high-tier gear and weaponery. And, sometimes, gaming cards."
+ rules = "Squad Tactics. Give all Syndicate units on your side +1/0."
+ icon_state = "nuke_op_leader"
+
+ mana_cost = 5
+ attack = 3
+ health = 4
+
+ faction = "Syndicate"
+ rarity = "Epic"
+ card_type = "Unit"
+
+/datum/tcg_card/pack_nuclear/nuke_op
+ name = "Nuclear Team Commander"
+ desc = "An unequipped nuclear operative, ready to buy some gear and go full ham!"
+ rules = "Squad Tactics. On summon: Search your deck for Syndicate equipment. Equip it on this unit. Shuffle it afterwards."
+ icon_state = "nuke_op"
+
+ mana_cost = 3
+ attack = 2
+ health = 3
+
+ faction = "Syndicate"
+ rarity = "Common"
+ card_type = "Unit"
+
+/datum/tcg_card/pack_nuclear/dark_gygax
+ name = "Dark Gygax"
+ desc = "A lightweight exosuit, painted in a dark scheme. This model appears to have some modifications."
+ rules = "Squad Tactics."
+ icon_state = "dark_gygax"
+
+ mana_cost = 6
+ attack = 8
+ health = 4
+
+ faction = "Syndicate"
+ rarity = "Epic"
+ card_type = "Unit"
+
+/datum/tcg_card/pack_nuclear/mauler
+ name = "Mauler"
+ desc = "Heavy-duty, combat exosuit, developed off of the existing Marauder model. A perfect killing machine equipped with best weaponery in the world."
+ rules = "Squad Tactics. Deadeye."
+ icon_state = "mauler"
+
+ mana_cost = 8
+ attack = 8
+ health = 8
+
+ faction = "Syndicate"
+ rarity = "Legendary"
+ card_type = "Unit"
+
+/datum/tcg_card/pack_nuclear/saboteur
+ name = "Syndicate Saboteur Cyborg"
+ desc = "A streamlined engineering cyborg, equipped with covert modules. Allows to sabotage all the systems you want without being suspicious."
+ rules = "Block the first spell your opponent plays against your hero."
+ icon_state = "saboteur"
+
+ mana_cost = 3
+ attack = 1
+ health = 3
+
+ faction = "Syndicate"
+ rarity = "Rare"
+ card_type = "Unit"
+
+/datum/tcg_card/pack_nuclear/medic
+ name = "Syndicate Medical Cyborg"
+ desc = "A combat medical cyborg. Has limited offensive potential, but makes more than up for it with its support capabilities."
+ rules = "Each turn you can give one of your units 0/+1."
+ icon_state = "medic"
+
+ mana_cost = 4
+ attack = 1
+ health = 2
+
+ faction = "Syndicate"
+ rarity = "Rare"
+ card_type = "Unit"
+
+/datum/tcg_card/pack_nuclear/combat
+ name = "Syndicate Assault Cyborg"
+ desc = "A cyborg designed and programmed for systematic extermination of non-Syndicate personnel."
+ rules = "Squad Tactics. Fury."
+ icon_state = "combat"
+
+ mana_cost = 5
+ attack = 4
+ health = 4
+
+ faction = "Syndicate"
+ rarity = "Epic"
+ card_type = "Unit"
+
+/datum/tcg_card/pack_nuclear/emag
+ name = "Cryptographic Sequencer"
+ desc = "It's a card with a magnetic strip attached to some circuitry."
+ rules = "Convert an enemy silicon unit to your side."
+ icon_state = "emag"
+
+ mana_cost = 4
+
+ faction = "Syndicate"
+ rarity = "Common"
+ card_type = "Spell"
+
+/datum/tcg_card/pack_nuclear/bomb
+ name = "Syndicate Bomb"
+ desc = "A large and menacing device. Can be bolted down with a wrench."
+ rules = "Deal 6 damage to all units on the field after 2 turns."
+ icon_state = "bomb"
+
+ mana_cost = 6
+
+ faction = "Syndicate"
+ rarity = "Rare"
+ card_type = "Spell"
+
+/datum/tcg_card/pack_nuclear/honkbomb
+ name = "H.O.N.K. Bomb"
+ desc = "A bomb filled to the brim with bananium and dehydrated clowns!"
+ rules = "Search your deck for up to 3 Clowns. Play them for free. Shuffle the deck afterwards."
+ icon_state = "honkbomb"
+
+ mana_cost = 8
+
+ faction = "Syndicate"
+ rarity = "Epic"
+ card_type = "Spell"
+
+/datum/tcg_card/pack_nuclear/assault_pod
+ name = "Assault Pod"
+ desc = "Raining Steel. Nothing personnel, just disky."
+ rules = "Summon up to 3 units from your hand with 4 mana discount each."
+ icon_state = "assault_pod"
+
+ mana_cost = 8
+
+ faction = "Syndicate"
+ rarity = "Epic"
+ card_type = "Spell"
+
+/datum/tcg_card/pack_nuclear/c4
+ name = "C4"
+ desc = "A bunch of plastic explosives wired together."
+ rules = "Deal 2 damage to an enemy unit."
+ icon_state = "c4"
+
+ mana_cost = 1
+
+ faction = "Syndicate"
+ rarity = "Common"
+ card_type = "Spell"
+
+/datum/tcg_card/pack_nuclear/emp
+ name = "EMP Grenade"
+ desc = "A modern-looking grenade which creates a powerful EMP upon activation. Do not eat."
+ rules = "Deal 2 damage to an enemy silicon unit."
+ icon_state = "emp"
+
+ mana_cost = 0
+
+ faction = "Syndicate"
+ rarity = "Common"
+ card_type = "Spell"
+
+/datum/tcg_card/pack_nuclear/zombie
+ name = "Romerol Zombie"
+ desc = "A horrible abomination, resembling a dead human. Has green skin and red claws. Wait, is it blood dripping from them?"
+ rules = "After killing an enemy unit, search your deck for a Zombie and summon it for free."
+ icon_state = "zombie"
+
+ mana_cost = 8
+ attack = 4
+ health = 3
+
+ faction = "Syndicate"
+ rarity = "Epic"
+ card_type = "Unit"
+
+/datum/tcg_card/pack_nuclear/north_star
+ name = "North Star Armbands"
+ desc = "The armbands of a deadly martial artist. Makes you pretty keen to put an end to evil in an extremely violent manner."
+ rules = "Equipped unit can attack twice per turn."
+ icon_state = "north_star"
+
+ mana_cost = 4
+
+ faction = "Syndicate"
+ rarity = "Rare"
+ card_type = "Equipment"
+
+/datum/tcg_card/pack_nuclear/fastdetonation
+ name = "Big-Ass Red Button"
+ desc = "A menacing red button. What could it do?"
+ rules = "Activate all spells that require several turns to occur."
+ icon_state = "fastdetonation"
+
+ mana_cost = 2
+
+ faction = "Syndicate"
+ rarity = "Common"
+ card_type = "Spell"
+
+/datum/tcg_card/pack_nuclear/rpg
+ name = "PML-9 Rocket Launcher"
+ desc = "A reusable rocket propelled grenade launcher. The words \"NT this way\" and an arrow have been written near the barrel."
+ rules = "When equipped unit attacks enemy units, flip a coin. If heads, destroy the unit. If tails, deal 1/2 damage instead of the full blow."
+ icon_state = "rpg"
+
+ mana_cost = 8
+ attack = 6
+
+ faction = "Syndicate"
+ rarity = "Legendary"
+ card_type = "Equipment"
+
+/datum/tcg_card/pack_nuclear/darkhonk
+ name = "Dark H.O.N.K. Mech"
+ desc = "Produced by \"Tyranny of Honk, INC\", this exosuit is designed as heavy clown-support. This one was painted black for maximum HONKing!"
+ rules = "Taunt. Squad Tactics. Blocker."
+ icon_state = "darkhonk"
+
+ mana_cost = 8
+ attack = 6
+ health = 8
+
+ faction = "Syndicate"
+ rarity = "Epic"
+ card_type = "Unit"
+
+/datum/tcg_card/pack_nuclear/shielded_hardsuit
+ name = "Shielded Blood-red Hardsuit"
+ desc = "An advanced version of Gorlex Maradeurs' hardsuit with built-in energy shielding."
+ rules = "Give equipped unit First Strike."
+ icon_state = "shielded_hardsuit"
+
+ mana_cost = 4
+ attack = 0
+ health = 4
+
+ faction = "Syndicate"
+ rarity = "Epic"
+ card_type = "Equipment"
+
+/datum/tcg_card/pack_nuclear/nuclear_disk
+ name = "Nuclear Authentication Disk"
+ desc = "Better keep this safe."
+ rules = "Give equipped unit Taunt. After the equipped unit dies, re-equip this card to the killer."
+ icon_state = "nuclear_disk"
+
+ mana_cost = 0
+ attack = 1
+ health = 1
+
+ faction = "Syndicate"
+ rarity = "Epic"
+ card_type = "Equipment"
+
+/datum/tcg_card/pack_nuclear/buzzkill
+ name = "Buzzkill grenade"
+ desc = "A whole swarm of angry bees filled with deadly toxins. Nasty!"
+ rules = "Hivemind."
+ icon_state = "buzzkill"
+
+ mana_cost = 4
+ attack = 1
+ health = 5
+
+ faction = "Syndicate"
+ rarity = "Rare"
+ card_type = "Unit"
+
+/datum/tcg_card/pack_nuclear/syndicate_minibomb
+ name = "Syndicate Minibomb"
+ desc = "A syndicate manufactured explosive used to sow destruction and chaos."
+ rules = "Deal 3 damage to an enemy unit and units adjacent to it."
+ icon_state = "syndicate_minibomb"
+
+ mana_cost = 3
+
+ faction = "Syndicate"
+ rarity = "Common"
+ card_type = "Spell"
+
+/datum/tcg_card/pack_nuclear/viscerator
+ name = "Viscerator"
+ desc = "A small yet deadly machine, designed to rip it's targets apart."
+ rules = "Gain +1/+1 for every other viscerator on field."
+ icon_state = "viscerator"
+
+ mana_cost = 2
+ attack = 3
+ health = 1
+
+ faction = "Syndicate"
+ rarity = "Common"
+ card_type = "Unit"
+
+/datum/tcg_card/pack_nuclear/cqc
+ name = "CQC Manual"
+ desc = "A manual that teaches a single user tactical Close-Quarters Combat before self-destructing."
+ rules = "Give equipped unit Deadeye and First Strike."
+ icon_state = "cqc"
+
+ mana_cost = 4
+ attack = 4
+ health = 3
+
+ faction = "Syndicate"
+ rarity = "Epic"
+ card_type = "Equipment"
+
+/datum/tcg_card/pack_nuclear/holoparasite
+ name = "Holoparasite"
+ desc = "A mysterious being that stands by its charge, ever vigilant."
+ rules = "On summon: \"Link\" this unit to another unit. Whenever this unit takes damage, instead, transfer all damage to the linked unit."
+ icon_state = "holoparasite"
+
+ mana_cost = 6
+ attack = 8
+ health = 0
+
+ faction = "Syndicate"
+ rarity = "Legendary"
+ card_type = "Unit"
+
+/datum/tcg_card/pack_nuclear/rapier
+ name = "Rapier"
+ desc = "An elegant plastitanium rapier with a diamond tip and coated in a specialized knockout poison."
+ rules = ""
+ icon_state = "rapier"
+
+ mana_cost = 2
+ attack = 3
+ health = 0
+
+ faction = "Syndicate"
+ rarity = "Rare"
+ card_type = "Equipment"
+
+/datum/tcg_card/pack_nuclear/sniper
+ name = "Sniper Rifle"
+ desc = "A long ranged weapon that does significant damage. No, you can't quickscope."
+ rules = "Give equipped unit Deadeye."
+ icon_state = "sniper"
+
+ mana_cost = 6
+ attack = 5
+ health = 0
+
+ faction = "Syndicate"
+ rarity = "Epic"
+ card_type = "Equipment"
+
+/datum/tcg_card/pack_nuclear/honksword
+ name = "Bananium Sword"
+ desc = "An elegant weapon, for a more \"civilized\" age."
+ rules = "Equipped unit does not deal damage. Instead, it taps the attacked card without activating it's effects."
+ icon_state = "honksword"
+
+ mana_cost = 3
+ attack = 0
+ health = 0
+
+ faction = "Syndicate"
+ rarity = "Common"
+ card_type = "Equipment"
+
+/datum/tcg_card/pack_nuclear/mustache
+ name = "Mustache Grenade"
+ desc = "A handsomely-attired teargas grenade."
+ rules = "Unequip all enemy units. Unequipped equipment cards must be discarded."
+ icon_state = "mustache"
+
+ mana_cost = 5
+
+ faction = "Syndicate"
+ rarity = "Common"
+ card_type = "Spell"
+
+/datum/tcg_card/pack_nuclear/taeclowndo
+ name = "Tae-Clown-Do"
+ desc = "A pair of clown shoes, infused with bananium. Rumors say that these can teach their wearer the art of Tae-Clown-Do."
+ rules = "Flip a coin. If heads, your enemy skips a turn. If tails, you skip a turn instead."
+ icon_state = "taeclowndo"
+
+ mana_cost = 3
+
+ faction = "Syndicate"
+ rarity = "Epic"
+ card_type = "Spell"
diff --git a/code/modules/tcg/pack_star.dm b/code/modules/tcg/pack_star.dm
new file mode 100644
index 0000000000..4b8e32e631
--- /dev/null
+++ b/code/modules/tcg/pack_star.dm
@@ -0,0 +1,304 @@
+/datum/tcg_card/pack_star
+ pack = 'icons/obj/tcg/pack_star.dmi'
+
+/datum/tcg_card/pack_star/golem
+ name = "Adamantine Golem"
+ desc = "An adamantine golem, immune to magic and being able to coordinate other golems, has a great power in combat."
+ rules = "Holy. Taunt."
+ icon_state = "golem"
+
+ mana_cost = 4
+ attack = 4
+ health = 5
+
+ faction = "Unique"
+ rarity = "Rare"
+ card_type = "Unit"
+
+/obj/item/tcg_card/special/golem
+ datum_type = /datum/tcg_card/pack_star/golem
+
+/datum/tcg_card/pack_star/xenomaid
+ name = "Lusty Xenomorph Maid"
+ desc = "Just a lusty xenomorph maid, nothing to see here."
+ rules = "Blocker. Each turn, gain -1/-1."
+ icon_state = "xenomaid"
+
+ mana_cost = 3
+ attack = 6
+ health = 6
+
+ faction = "Unique"
+ rarity = "Epic"
+ card_type = "Unit"
+
+/obj/item/tcg_card/special/xenomaid
+ datum_type = /datum/tcg_card/pack_star/xenomaid
+
+/datum/tcg_card/pack_star/morph
+ name = "Morph"
+ desc = "A revolting, pulsating pile of flesh that can mimic everything it sees."
+ rules = "On summon: Copy stats of an opponent's card."
+ icon_state = "morph"
+
+ mana_cost = 4
+ attack = 0
+ health = 1
+
+ faction = "Unique"
+ rarity = "Common"
+ card_type = "Unit"
+
+/obj/item/tcg_card/special/morph
+ datum_type = /datum/tcg_card/pack_star/morph
+
+/datum/tcg_card/pack_star/demonic_miner
+ name = "Demonic Miner"
+ desc = "An soul of extremely geared miner, driven crazy or possessed by the demonic forces here, either way a terrifying enemy."
+ rules = "Each turn: Deal 1 damage to all the creatures on the field."
+ icon_state = "demonic_miner"
+
+ mana_cost = 7
+ attack = 4
+ health = 5
+
+ faction = "Unique"
+ rarity = "Rare"
+ card_type = "Unit"
+
+/obj/item/tcg_card/special/demonic_miner
+ datum_type = /datum/tcg_card/pack_star/demonic_miner
+
+/datum/tcg_card/pack_star/wendigo
+ name = "Wendigo"
+ desc = "A mythological man-eating legendary creature, you probably aren't going to survive this."
+ rules = ""
+ icon_state = "wendigo"
+
+ mana_cost = 6
+ attack = 5
+ health = 3
+
+ faction = "Unique"
+ rarity = "Common"
+ card_type = "Unit"
+
+/obj/item/tcg_card/special/wendigo
+ datum_type = /datum/tcg_card/pack_star/wendigo
+
+/datum/tcg_card/pack_star/honk
+ name = "H.O.N.K. Mech"
+ desc = "Produced by \"Tyranny of Honk, INC\", this exosuit is designed as heavy clown-support. Used to spread the fun and joy of life. HONK!"
+ rules = "Taunt."
+ icon_state = "honk"
+
+ mana_cost = 8
+ attack = 6
+ health = 8
+
+ faction = "Unique"
+ rarity = "Epic"
+ card_type = "Unit"
+
+/obj/item/tcg_card/special/honk
+ datum_type = /datum/tcg_card/pack_star/honk
+
+/datum/tcg_card/pack_star/ratvar
+ name = "Clockwork Slab"
+ desc = "A link between clockwork servants and the Celestial Derelict. It contains information, recites scripture, and is Servant's most vital tool."
+ rules = "Equipped unit gains Clockwork and can't attack units with Holy."
+ icon_state = "ratvar"
+
+ mana_cost = 2
+ attack = 3
+ health = 0
+
+ faction = "Unique"
+ rarity = "Common"
+ card_type = "Equipment"
+
+/obj/item/tcg_card/special/ratvar
+ datum_type = /datum/tcg_card/pack_star/ratvar
+
+/datum/tcg_card/pack_star/hierophant
+ name = "Hierophant Club"
+ desc = "The strange technology of this large club allows various nigh-magical feats. It used to beat you, but now you can set the beat."
+ rules = "Give equipped unit First Strike."
+ icon_state = "hierophant"
+
+ mana_cost = 4
+ attack = 2
+ health = 0
+
+ faction = "Unique"
+ rarity = "Rare"
+ card_type = "Equipment"
+
+/obj/item/tcg_card/special/hierophant
+ datum_type = /datum/tcg_card/pack_star/hierophant
+
+/datum/tcg_card/pack_star/abductor
+ name = "Alien Gland"
+ desc = "A nausea-inducing hunk of twisting flesh and metal. These things are often found after people were abducted by grey-skinned aliens."
+ rules = "Each turn: Flip a coin. If heads, unit gain +1/+1. If tails, unit gains -2/-1."
+ icon_state = "abductor"
+
+ mana_cost = 2
+ attack = 0
+ health = 0
+
+ faction = "Unique"
+ rarity = "Common"
+ card_type = "Equipment"
+
+/obj/item/tcg_card/special/abductor
+ datum_type = /datum/tcg_card/pack_star/abductor
+
+/datum/tcg_card/pack_star/space_carp
+ name = "Space Carp"
+ desc = "A failed weaponery experiment, looking like a ferocious, fang-bearing creature that resembles a fish."
+ rules = ""
+ icon_state = "space_carp"
+
+ mana_cost = 1
+ attack = 2
+ health = 1
+
+ faction = "Unique"
+ rarity = "Common"
+ card_type = "Unit"
+
+/obj/item/tcg_card/special/space_carp
+ datum_type = /datum/tcg_card/pack_star/space_carp
+
+/datum/tcg_card/pack_star/spess_pirate
+ name = "Space Pirate"
+ desc = "Space Pirate does whatever he wants because he is free. Sadly, Space Rum insn't free."
+ rules = "On summon: Draw 2 cards. If there are no spells, discard them."
+ icon_state = "spess_pirate"
+
+ mana_cost = 4
+ attack = 3
+ health = 2
+
+ faction = "Unique"
+ rarity = "Rare"
+ card_type = "Unit"
+
+/obj/item/tcg_card/special/spess_pirate
+ datum_type = /datum/tcg_card/pack_star/spess_pirate
+
+/datum/tcg_card/pack_star/gondola
+ name = "Gondola"
+ desc = "Gondola is the silent walker. Having no hands he embodies the Taoist principle of wu-wei (non-action) while his smiling facial expression shows his utter and complete acceptance of the world as it is. Its hide is extremely valuable."
+ rules = "Taunt. Holy."
+ icon_state = "gondola"
+
+ mana_cost = 6
+ attack = 0
+ health = 6
+
+ faction = "Unique"
+ rarity = "Epic"
+ card_type = "Unit"
+
+/obj/item/tcg_card/special/gondola
+ datum_type = /datum/tcg_card/pack_star/gondola
+
+/datum/tcg_card/pack_star/phazon
+ name = "Phazon"
+ desc = "The pinnacle of scientific research and pride of Nanotrasen, Phazon uses cutting edge bluespace technology and expensive materials."
+ rules = "Whenever this unit takes damage, flip a coin. If heads, take no damage. If tails, take double damage."
+ icon_state = "phazon"
+
+ mana_cost = 8
+ attack = 5
+ health = 7
+
+ faction = "Unique"
+ rarity = "Rare"
+ card_type = "Unit"
+
+/obj/item/tcg_card/special/phazon
+ datum_type = /datum/tcg_card/pack_star/phazon
+
+//Ultimate Exodia cards. I really, really doubt that someone will ever find them.
+
+/datum/tcg_card/exodia
+ pack = 'icons/obj/tcg/pack_star.dmi'
+
+/datum/tcg_card/exodia/exodia_singulo
+ name = "Singularity"
+ desc = "A monstrous gravitational singularity, pitch black(but not quiet) and very menacings."
+ rules = "This card doesn't leave field. At the end of each turn: Remove all the cards(except other Exodia cards) from the field."
+ icon_state = "exodia_singularity"
+
+ mana_cost = 8
+
+ faction = "Exodia"
+ rarity = "Exodia"
+ card_type = "Spell"
+
+/datum/tcg_card/exodia/exodia_tesla
+ name = "Energy Orb"
+ desc = "An orb made out of hypercharged plasma. An ultimate bug zapper."
+ rules = "This card doesn't leave field. Every turn all units take 4 damage."
+ icon_state = "exodia_tesla"
+
+ mana_cost = 8
+
+ faction = "Exodia"
+ rarity = "Exodia"
+ card_type = "Spell"
+
+/datum/tcg_card/exodia/exodia_narie
+ name = "Nar-Sie"
+ desc = "An avatar of the Nar-Sie, one of the Eldritch Gods."
+ rules = "This card doesn't leave field. Every turn all units take 1 damage and you restore 1 lifeshard."
+ icon_state = "exodia_narsie"
+
+ mana_cost = 8
+
+ faction = "Exodia"
+ rarity = "Exodia"
+ card_type = "Spell"
+
+/datum/tcg_card/exodia/exodia_ratvar
+ name = "Ratvar"
+ desc = "Ratvar, the god of cogs and clockwork mechanisms, was trapped by Nar-Sie a long ago."
+ rules = "This card doesn't leave field. Every turn enemy hero recieves 2 lifeshard damage."
+ icon_state = "exodia_ratvar"
+
+ mana_cost = 8
+
+ faction = "Exodia"
+ rarity = "Exodia"
+ card_type = "Spell"
+
+/datum/tcg_card/exodia/exodia
+ name = "Eldritch Horror"
+ desc = "The Eldritch Horror is a long forgotten demon that was the beginning of everything. Afterwards, his creations revolted and left him abadoned in endless void."
+ rules = "This card doesn't leave field. If all other 4 Exodia cards are on the field(Singularity, Energy Orb, Nar-Sie and Ratvar), the game is won."
+ icon_state = "exodia_eldritch"
+
+ mana_cost = 8
+
+ faction = "Exodia"
+ rarity = "Unique" //No drop lads
+ card_type = "Spell"
+
+/obj/item/tcg_card/special/exodia_singulo
+ datum_type = /datum/tcg_card/exodia/exodia_singulo
+
+/obj/item/tcg_card/special/exodia_tesla
+ datum_type = /datum/tcg_card/exodia/exodia_tesla
+
+/obj/item/tcg_card/special/exodia_narie
+ datum_type = /datum/tcg_card/exodia/exodia_narie
+
+/obj/item/tcg_card/special/exodia_ratvar
+ datum_type = /datum/tcg_card/exodia/exodia_ratvar
+
+/obj/item/tcg_card/special/exodia
+ datum_type = /datum/tcg_card/exodia/exodia
+
diff --git a/code/modules/uplink/uplink_items/uplink_badass.dm b/code/modules/uplink/uplink_items/uplink_badass.dm
index 43e5523bad..ec0ebf66d1 100644
--- a/code/modules/uplink/uplink_items/uplink_badass.dm
+++ b/code/modules/uplink/uplink_items/uplink_badass.dm
@@ -78,3 +78,16 @@
limited_stock = 1
cant_discount = TRUE
include_modes = list(/datum/game_mode/nuclear, /datum/game_mode/nuclear/clown_ops)
+
+/datum/uplink_item/badass/gaming_cardpack
+ name = "TCG Card Operatives Bundle"
+ desc = "A bundle full of goodies required to work as a TCG Card Operative. A warm pajama, a mug of cocoa, a plushie and a two packs full of rare 2560 Core Set cards!"
+ item = /obj/item/storage/box/syndie_kit/sleepytime/cardpack
+ cost = 20
+ include_modes = list(/datum/game_mode/nuclear, /datum/game_mode/nuclear/clown_ops)
+
+/datum/uplink_item/badass/cardpack
+ name = "TCG Nuclear Cardpack"
+ desc = "A cardpack filled with top-tier TCG cards."
+ item = /obj/item/cardpack/syndicate
+ cost = 4
diff --git a/code/modules/uplink/uplink_items/uplink_clothing.dm b/code/modules/uplink/uplink_items/uplink_clothing.dm
index 6163e5722a..de15b16b68 100644
--- a/code/modules/uplink/uplink_items/uplink_clothing.dm
+++ b/code/modules/uplink/uplink_items/uplink_clothing.dm
@@ -104,3 +104,10 @@
desc = "An eyepatch that connects itself to your eye socket, enhancing your shooting to an impossible degree, allowing your bullets to ricochet far more often than usual."
item = /obj/item/clothing/glasses/eyepatch/syndicate
cost = 8
+
+/datum/uplink_item/device_tools/ablative_armwraps
+ name = "Ablative Armwraps"
+ desc = "A pair of highly reinforced armwraps allowing the user to parry almost anything. Fully reflects projectiles, no downsides to failing, but is very hard to parry melee with."
+ cost = 6
+ item = /obj/item/clothing/gloves/fingerless/ablative
+ exclude_modes = list(/datum/game_mode/nuclear)
diff --git a/code/modules/uplink/uplink_items/uplink_stealth.dm b/code/modules/uplink/uplink_items/uplink_stealth.dm
index ff6d66a483..1bd75fa2b1 100644
--- a/code/modules/uplink/uplink_items/uplink_stealth.dm
+++ b/code/modules/uplink/uplink_items/uplink_stealth.dm
@@ -102,6 +102,7 @@
along with slurred speech, aggression, and the ability to infect others with this agent."
item = /obj/item/storage/box/syndie_kit/romerol
cost = 25
+ player_minimum = 25
cant_discount = TRUE
exclude_modes = list(/datum/game_mode/nuclear)
@@ -115,7 +116,7 @@
cost = 4
exclude_modes = list(/datum/game_mode/nuclear, /datum/game_mode/nuclear/clown_ops)
-datum/uplink_item/stealthy_weapons/taeclowndo_shoes
+/datum/uplink_item/stealthy_weapons/taeclowndo_shoes
name = "Tae-clown-do Shoes"
desc = "A pair of shoes for the most elite agents of the honkmotherland. They grant the mastery of taeclowndo with some honk-fu moves as long as they're worn."
cost = 12
diff --git a/code/modules/vending/autodrobe.dm b/code/modules/vending/autodrobe.dm
index b4490f715b..264d262a1d 100644
--- a/code/modules/vending/autodrobe.dm
+++ b/code/modules/vending/autodrobe.dm
@@ -120,7 +120,14 @@
/obj/item/clothing/ears/headphones = 2,
/obj/item/clothing/head/wig/random = 3,
/obj/item/clothing/suit/ran = 2,
- /obj/item/clothing/head/ran = 2)
+ /obj/item/clothing/head/ran = 2,
+ /obj/item/clothing/mask/gas/timidcostume = 3,
+ /obj/item/clothing/suit/hooded/wintercoat/timidcostume = 3,
+ /obj/item/clothing/shoes/timidcostume = 3,
+ /obj/item/clothing/mask/gas/timidcostume/man = 3,
+ /obj/item/clothing/suit/hooded/wintercoat/timidcostume/man = 3,
+ /obj/item/clothing/shoes/timidcostume/man = 3,
+ )
contraband = list(/obj/item/clothing/suit/judgerobe = 1,
/obj/item/clothing/head/powdered_wig = 1,
/obj/item/gun/magic/wand = 2,
diff --git a/code/modules/vending/clothesmate.dm b/code/modules/vending/clothesmate.dm
index 462d4b5cb5..707557ff73 100644
--- a/code/modules/vending/clothesmate.dm
+++ b/code/modules/vending/clothesmate.dm
@@ -21,6 +21,7 @@
/obj/item/clothing/suit/jacket/puffer/vest = 4,
/obj/item/clothing/suit/jacket/puffer = 4,
/obj/item/clothing/suit/hooded/cloak/david = 4,
+ /obj/item/clothing/neck/cancloak = 4,
/obj/item/clothing/suit/bomber = 5,
/obj/item/clothing/under/suit/turtle/teal = 3,
/obj/item/clothing/under/suit/turtle/grey = 3,
@@ -31,9 +32,26 @@
/obj/item/clothing/under/suit/burgundy = 3,
/obj/item/clothing/under/suit/charcoal = 3,
/obj/item/clothing/under/suit/white = 3,
+ /obj/item/clothing/under/suit/tan = 3,
+ /obj/item/clothing/under/suit/charismatic_suit = 3,
/obj/item/clothing/under/costume/kilt = 3,
+ /obj/item/clothing/suit/suspenders = 3,
/obj/item/clothing/under/misc/overalls = 3,
/obj/item/clothing/under/suit/sl = 3,
+ /obj/item/clothing/accessory/sweater = 3,
+ /obj/item/clothing/accessory/sweater/pink = 3,
+ /obj/item/clothing/accessory/sweater/heart = 3,
+ /obj/item/clothing/accessory/sweater/blue = 3,
+ /obj/item/clothing/accessory/sweater/nt = 3,
+ /obj/item/clothing/accessory/sweater/mint = 3,
+ /obj/item/clothing/accessory/sweater/shoulderless = 3,
+ /obj/item/clothing/accessory/sweater/flower = 3,
+ /obj/item/clothing/accessory/turtleneck = 2,
+ /obj/item/clothing/accessory/turtleneck/red = 2,
+ /obj/item/clothing/accessory/turtleneck/comfy = 2,
+ /obj/item/clothing/accessory/turtleneck/tactifool = 2,
+ /obj/item/clothing/accessory/turtleneck/tactifool/green = 2,
+ /obj/item/clothing/accessory/turtleneck/tactifool/blue = 2,
/obj/item/clothing/under/sweater = 3,
/obj/item/clothing/under/sweater/black = 3,
/obj/item/clothing/under/sweater/purple = 3,
@@ -50,7 +68,14 @@
/obj/item/clothing/under/pants/black = 4,
/obj/item/clothing/under/pants/tan = 4,
/obj/item/clothing/under/pants/track = 3,
+ /obj/item/clothing/under/pants/polypants = 4,
+ /obj/item/clothing/accessory/suitjacket = 2,
+ /obj/item/clothing/accessory/suitjacket/charcoal = 2,
+ /obj/item/clothing/accessory/suitjacket/navy = 2,
+ /obj/item/clothing/accessory/suitjacket/burgundy = 2,
+ /obj/item/clothing/accessory/suitjacket/checkered = 2,
/obj/item/clothing/suit/jacket/miljacket = 5,
+ /obj/item/clothing/suit/jacket/urbanjacket/polychromic = 5,
/obj/item/clothing/under/suit/white_on_white/skirt = 2,
/obj/item/clothing/under/rank/captain/suit/skirt = 2,
/obj/item/clothing/under/rank/civilian/head_of_personnel/suit/skirt = 2,
@@ -74,6 +99,12 @@
/obj/item/clothing/neck/stripedbluescarf = 3,
/obj/item/clothing/neck/stripedgreenscarf = 3,
/obj/item/clothing/accessory/waistcoat = 2,
+ /obj/item/clothing/accessory/waistcoat/red = 2,
+ /obj/item/clothing/accessory/waistcoat/grey = 2,
+ /obj/item/clothing/accessory/waistcoat/brown = 2,
+ /obj/item/clothing/accessory/waistcoat/sweatervest = 2,
+ /obj/item/clothing/accessory/waistcoat/sweatervest/blue = 2,
+ /obj/item/clothing/accessory/waistcoat/sweatervest/red = 2,
/obj/item/clothing/under/dress/skirt = 3,
/obj/item/clothing/under/dress/skirt/blue = 3,
/obj/item/clothing/under/dress/skirt/red = 3,
@@ -132,22 +163,22 @@
/obj/item/clothing/ears/headphones = 10,
/obj/item/clothing/suit/apron/purple_bartender = 4,
/obj/item/clothing/under/rank/civilian/bartender/purple = 4,
+
/* Commenting out until next Christmas or made automatic
+ /obj/item/clothing/accessory/sweater/uglyxmas = 3,
/obj/item/clothing/under/costume/christmas = 3,
/obj/item/clothing/under/costume/christmas/green = 3,
/obj/item/clothing/under/costume/christmas/croptop = 3,
/obj/item/clothing/under/costume/christmas/croptop/green = 3,
- */
/obj/item/clothing/suit/hooded/wintercoat/christmascoatr = 3,
/obj/item/clothing/suit/hooded/wintercoat/christmascoatg = 3,
/obj/item/clothing/suit/hooded/wintercoat/christmascoatrg = 3,
- /*Commenting out until next Christmas or made automatic
/obj/item/clothing/head/christmashat = 3,
/obj/item/clothing/head/christmashatg = 3,
- */
/obj/item/clothing/shoes/winterboots/christmasbootsr = 3,
/obj/item/clothing/shoes/winterboots/christmasbootsg = 3,
/obj/item/clothing/shoes/winterboots/santaboots = 3,
+ */
/obj/item/clothing/head/cowboyhat = 3,
/obj/item/clothing/head/cowboyhat/black = 3,
/obj/item/clothing/head/cowboyhat/white = 3,
@@ -161,7 +192,8 @@
/obj/item/clothing/under/costume/cheongsam/white = 3,
/obj/item/clothing/under/costume/cheongsam/red = 3,
/obj/item/storage/backpack/snail = 3)
- contraband = list(/obj/item/clothing/under/syndicate/tacticool = 3,
+ contraband = list(/obj/item/clothing/accessory/turtleneck/tactifool/syndicate = 3,
+ /obj/item/clothing/under/syndicate/tacticool = 3,
/obj/item/clothing/under/syndicate/tacticool/skirt = 3,
/obj/item/clothing/mask/balaclava = 3,
/obj/item/clothing/head/ushanka = 3,
@@ -182,7 +214,9 @@
/obj/item/clothing/neck/necklace/dope = 5,
/obj/item/clothing/suit/jacket/letterman_nanotrasen = 5,
/obj/item/clothing/under/misc/corporateuniform = 5,
- /obj/item/clothing/suit/hooded/wintercoat/polychromic = 5)
+ /obj/item/clothing/suit/hooded/wintercoat/polychromic = 5,
+ /obj/item/clothing/suit/toggle/wbreakpoly/polychromic = 5,
+ /obj/item/clothing/shoes/sneakers/poly/polychromic = 10)
refill_canister = /obj/item/vending_refill/clothing
default_price = PRICE_CHEAP
extra_price = PRICE_BELOW_NORMAL
diff --git a/code/modules/vending/games.dm b/code/modules/vending/games.dm
index 6c29b412e7..cea9c5ae70 100644
--- a/code/modules/vending/games.dm
+++ b/code/modules/vending/games.dm
@@ -7,7 +7,9 @@
/obj/item/storage/dice = 10,
/obj/item/toy/cards/deck/cas = 3,
/obj/item/toy/cards/deck/cas/black = 3,
- /obj/item/toy/cards/deck/unum = 3)
+ /obj/item/toy/cards/deck/unum = 3,
+ /obj/item/cardpack/series_one = 10,
+ /obj/item/tcgcard_binder = 5)
contraband = list(/obj/item/dice/fudge = 9)
premium = list(/obj/item/melee/skateboard/pro = 3,
/obj/item/melee/skateboard/hoverboard = 1)
diff --git a/code/modules/vending/kinkmate.dm b/code/modules/vending/kinkmate.dm
index 56d794e341..2316682e68 100644
--- a/code/modules/vending/kinkmate.dm
+++ b/code/modules/vending/kinkmate.dm
@@ -12,6 +12,7 @@
/obj/item/clothing/neck/petcollar = 5,
/obj/item/clothing/neck/petcollar/choker = 5,
/obj/item/clothing/neck/petcollar/leather = 5,
+ /obj/item/clothing/neck/necklace/cowbell = 5,
/obj/item/restraints/handcuffs/fake/kinky = 5,
/obj/item/clothing/glasses/sunglasses/blindfold = 4,
/obj/item/clothing/mask/muzzle = 4,
diff --git a/code/modules/vending/wardrobes.dm b/code/modules/vending/wardrobes.dm
index e88cfe33a3..eebb07938b 100644
--- a/code/modules/vending/wardrobes.dm
+++ b/code/modules/vending/wardrobes.dm
@@ -207,6 +207,7 @@
product_ads = "You turn me TRUE, use defines!;0110001101101100011011110111010001101000011001010111001101101000011001010111001001100101"
vend_reply = "Thank you for using the RoboDrobe!"
products = list(/obj/item/clothing/glasses/hud/diagnostic = 3,
+ /obj/item/stack/medical/nanogel = 5,
/obj/item/clothing/head/beret/robo = 3,
/obj/item/clothing/under/rank/rnd/roboticist = 3,
/obj/item/clothing/under/rank/rnd/roboticist/sleek = 3,
diff --git a/config/game_options.txt b/config/game_options.txt
index 3c53d9fecb..7776d87d4e 100644
--- a/config/game_options.txt
+++ b/config/game_options.txt
@@ -675,3 +675,6 @@ TURF_DIRT_THRESHOLD 100
## Default alpha of dirt on spawn
DIRT_ALPHA_STARTING 127
+
+## Allows pAI custom holoforms
+PAI_CUSTOM_HOLOFORMS
diff --git a/html/changelog.html b/html/changelog.html
index 8a1401744e..bdc642c889 100644
--- a/html/changelog.html
+++ b/html/changelog.html
@@ -50,896 +50,1042 @@
-->
-
04 October 2020
-
DeltaFire15 updated:
-
-
Synths / IPCs are no longer wound immune.
-
Husked IPCs / Synths should now be rendered correctly.
-
Falling vendors now squish synths / IPCs' limbs again.
-
Synths and IPCs now do not have some fun roundstart oversights anymore.
-
Regenerate_limbs now works for carbons with the ROBOTIC_LIMBS trait.
-
Pacifists no longer counterattack on parries if that attack would be harmful.
-
Heretic sacrifices now husk with the reason of burn, and deal some additional damage.
-
Neovgre can no longer become invincible on clock tiles.
-
Plushlings no longer break when absorbing snowflake plushies.
-
-
Detective-Google updated:
-
-
the snow cabin doors actually bolt now
-
+
19 February 2021
Putnam3145 updated:
-
Ghosts are no longer incapable of going away.
-
-
monster860 updated:
-
-
The slimeperson swap-body UI stays open when you switch bodies
+
Buzz Fuzz's addiction threshold is now a can and a sip as intended.
timothyteakettle updated:
-
limb id entry in mutant bodyparts now supports switching to/from species with gendered body parts
-
the minimum brightness of mutant parts is now a define
+
staring into pierced realities is now logged
-
02 October 2020
-
ArcaneMusic, with minor tweaks by TheObserver-sys updated:
-
-
Adds and modifies fertilizers, as well as a new stat, Instability.
-
Removes the rather disused functionality of irrigation hoses, temporarily disables circuit use on hydroponics trays.
-
Plant Analyzer have been upgraded. Using one in hand will now switch between a stat view of your plant, and a chemical view of your plant. tweak:Trays now accept and store reagents, as well as coming with an autogrow mode. However, these upgrades came at the cost of old self sufficiency, meaning you must attend to your plants a bit more often.
-
Earthsblood, while not being able to gild trays anymore, has been found to still be quite powerful as a fertilizer.
-
-
CoreFlare updated:
-
-
Altcloaks! Available in loadout.
-
-
Detective-Google updated:
-
-
a smattering of clothes from the RP server
-
detective wardrobe
-
-
EmeraldSundisk updated:
-
-
Adds the "Skelter" space ruin
-
Creates a few new area designations for the Skelter
-
Cargo techs now have access to a "long pants" variant of their standard work uniform
-
Adds said uniform to CargoDrobes and the loadout menu
-
-
ItzGabby updated:
-
-
Three new turf tiles.
-
Turf icons with multiple damage icons, with in-hand icons for each tile.
-
Edited the name and description to wooden.
-
-
LetterN updated:
-
-
craftable railings
-
ports robust savefiles
-
-
MrJWhit updated:
-
-
tweaked heavy suit dmi
-
Fixes drones not being able to quickslot items
-
-
Putnam3145 updated:
-
-
New policy config for pyroclastic slimes.
-
SDGF clones now naked.
-
SDGF is now way more likely to make a clone that will align with the creator's goals, with purity, making it a better antagging tool.
-
SDGF clones now have the same traits as the original.
-
transfer_ckey now resets view, preventing things like SDGF clones with much larger view range.
-
Policy configs have been added for SDGF, currently unused: SDGF, SDGF_ALIGNED, SDGF_UNALIGNED.
-
Shivering now has thresholds and fever's thresholds now work.
-
Made allturfs setup actually set up all turfs.
-
Dynamic is now more aggressive with adding antags.
-
Fixes vore pref saving.
-
-
SandPoot updated:
-
-
Fixes headslugs being unable to recover their human form.
-
-
Tupinambis updated:
-
-
Adds methane and methyl bromide gases.
-
Minor gas name/desc changes to improve consistency
-
Ports the methyl bromide tank from bay. Adds two new canister sprites for the new gases and CH4 screen alerts.
-
fixed a mispelling in the wound armor value for the bounty hunter suit
-
-
dapnee updated:
-
-
atrium, clinic, an extra office, a pseudo public mining area, two more deluxe dorms, micro beach, aux bathroom, two construction areas, mass driver, more intercoms
-
moved all of service, chapel, dorms, garden, holodeck to a different z-level, RnD is more open, maintenance is a bit more random, more firelocks, added more mine-able rock
-
fixed the buttons in xenobio, gave shutters to cargo's storage area, fixed holodeck so it works now, fixed some techfabs being lathes, added sensors to atmos tanks, more decals, couple more signs, little floral areas and sitting areas added to break up hallway monotony, mech chargers are no longer missing their consoles, whiteship won't crash into arrivals anymore while the area it takes up is more telegraphed, APC placement on AI sat entrance, missing wire node for the outer portion of the AI sat, civilian level now has a telecom relay
-
-
lolman360 updated:
-
-
smonk machine runtimes
-
automatic hydro tray has a unique sprite now (fancy robot arm)
-
-
timothyteakettle updated:
-
-
added luminescent and stargazer sprites as selectable body sprites for slimes
-
wound exponent lowered slightly from 1.225 to 1.2
-
wound exponent and limb damage multiplier are now config values
-
ipcs and synthlizards are now treated as actual robots, with robotic limbs, an extra organ, and better emp acts
-
surgeries for healing robotic limbs, and brain surgery for robotic heads
-
androids limbs now show up as intended
-
emps now work from 1-100 severity instead of 1/2 and the severity reduces as you move from the epicentre
-
-
zeroisthebiggay updated:
-
-
ratvar gf is complete
-
-
-
01 October 2020
+
18 February 2021
BlueWildrose updated:
-
Slimepeople are given unique laughs and screams.
-
Adds "warbles", "chimpers", and "puffs" to the customizable speech verbs for character.
-
-
-
29 September 2020
-
timothyteakettle updated:
-
-
fixed a typo causing your right eye colour to save as the left eye colour
-
-
-
28 September 2020
-
ArchieBeepBoop updated:
-
-
Craftable Micro Powered Fans
-
-
Degirin2120 updated:
-
-
Added engineering hazard jumpsuits, can be found in the engidrobe, comes in 3 varieties.
-
-
Putnam3145 updated:
-
-
Added a brute-force check-every-single-tile step to SSair when it has enough time to run.
-
G fuid production is now much lower.
-
Supermatter sabotage objective's gone.
-
Subterfuge objectives are now all equally likely.
-
Replaced a "(hopefully) 1" with a "2"
-
Cryoing no longer unwins already-won objectives.
-
-
SiliconMain updated:
-
-
Minor adjustment to material cost of long range atmos analyzer
-
-
Trilbyspaceclone updated:
-
-
Most drinks now have some animation in them, from basic soda bubbles fizzing around to ice cubes bobbing just a bit.
-
-
Tupinambis updated:
-
-
Ghost poly's color value is now a hex value instead of an oct value. This has been a thing for OVER FIVE YEARS
-
Updates TEG, Antimatter, Jetpack sprites (CO2 and Oxy from Eris).
-
Replaced old chair sprites with new ones ported and modified from eris.
-
Beds can now be placed both right and left.
-
Subtle changes to stool legs to give them more of a shine.
-
-
raspy-on-osu updated:
-
-
TEG power generation
-
-
thakyZ updated:
-
-
Added the ability to print the Light Replacer at the Engineering Protolathe
-
-
timothyteakettle updated:
-
-
turrets can once again be broken
-
you can now have heterochromia and select individual eye colours
-
-
-
27 September 2020
-
SiliconMain updated:
-
-
Holograms made from projectors (atmos, engi, sec, medical, ect...) can no longer be contaminated by radiation
-
-
-
26 September 2020
-
CoreFlare updated:
-
-
IPC's can have hair. Why wasn't this added earlier. Use the bald hairstyle for no hair.
-
-
-
25 September 2020
-
Putnam3145 updated:
-
-
Removed a non-working proc that already had its functionality implemented in another proc in the same file.
-
-
-
24 September 2020
-
Putnam3145 updated:
-
-
Atmos is free.
-
-
-
22 September 2020
-
Arturlang updated:
-
-
TGUI Statpanel
-
-
YakumoChen updated:
-
-
Mechsuits, robotics jumpsuits added to RoboDrobe
-
-
timothyteakettle updated:
-
-
character previews should be more consistent now
-
-
-
20 September 2020
-
DeltaFire15 updated:
-
-
Sutures work on simplemobs again.
-
Attacking dismembered bodyparts now targets the chest instead, for weapons aswell as unarmed attacks.
-
-
MrJWhit updated:
-
-
New sprites for chess pieces! You can craft them in-game with metal sheets.
-
-
silicons updated:
-
-
hulks can smash again (walls no longer break their hands)
-
acid no longer degrades armor
-
-
-
17 September 2020
-
DeltaFire15 updated:
-
-
Failing the plushmium reaction can now create peculiar plushies, depending on reaction volume.
-
The mood-buff from petting a plushie now works properly again.
-
Fixed wacky necropolis loot chest behavior
-
-
EmeraldSundisk updated:
-
-
Adds the Research Director's office to Omega Station
-
Adds 2 new solar arrays (and control rooms)
-
Adds some action figures that weren't there previously
-
The CMO's office now has a light switch
-
Slight readjustments to impacted areas
-
Readjusts the toxins air supply line to (ideally) be easier to service
-
Department camera consoles should now be able to actually check appropriate cameras
-
Xenobiology can now be locked down (by the Research Director)
-
-
MrJWhit updated:
-
-
Adds a brain damage line
-
-
Putnam3145 updated:
-
-
Your balls finally feel full, again.
-
-
timothyteakettle updated:
-
-
due to changes in policy, and several lawsuits, Nanotrasen has been forced to allow disabled people to sign up
-
-
-
16 September 2020
-
timothyteakettle updated:
-
-
fixed an icon path
-
-
-
12 September 2020
-
01 October 2020
-
BlueWildrose updated:
-
-
Slimepeople are given unique laughs and screams.
-
Adds "warbles", "chimpers", and "puffs" to the customizable speech verbs for character.
-
-
-
30 August 2020
-
raspy-on-osu updated:
-
-
new explosion echoes
-
explosion echo range
-
5 new explosion related sounds
-
-
-
28 August 2020
-
EmeraldSundisk updated:
-
-
Adds more paper to the library
-
The law office now has a desk window
-
Expands most of CogStation's exterior airlocks. Slightly adjusts surrounding areas to accommodate this.
-
Updates some of CogStation's paperwork
-
The rat in the morgue turned themselves into a possum. Funniest shit I've ever seen.
-
Adjusts some area designations so cameras should receive power properly
-
Cleans up an errant decal
+
Admins now receive messages regarding certain holodeck actions.
Hatterhat updated:
-
Traitor holoparasites can now only be bought once, because apparently you can only have one active holopara.
-
PDA bombs can now only be bought once per uplink.
+
Free Golem Ship GPSes now start as disabled. Like they were supposed to.
-
lolman360 updated:
-
-
atmos = radiation = chemistry.
-
-
shellspeed1 updated:
-
-
Adds slow mode for iv drips
-
-
timothyteakettle updated:
-
-
an ancient game over a thousand years old has re-emerged among crewmembers - rock paper scissors
-
customization features appear in alphabetical order where necessary
-
bokken do two more stamina damage now
-
you can now choose a body sprite as an anthromorph or anthromorphic insect, and can choose from aquatic/avian and apid respectively (and obviously back to the defaults too)
-
-
-
27 August 2020
-
silicons updated:
-
-
eyebeam lighting can only have 128 maximum HSV saturation now.
-
no more shotgun stripper clips in boxes.
-
goliath tentacles now do 20 damage to mechs at 25% ap
-
-
timothyteakettle updated:
-
-
changing your character's gender won't randomize its hairstyle and facial hairstyle now
-
-
-
26 August 2020
-
ancientpower updated:
-
-
Ghosts can read newscasters by clicking on them.
-
-
silicons updated:
-
-
hierophant vortex blasts now have 50% armor penetration vs mecha
-
ventcrawling now kicks off every attached/buckled mob, even for non humans.
-
-
-
25 August 2020
-
Hatterhat updated:
-
-
Insidious combat gloves have been replaced by insidious guerilla gloves. They're generally the same, except now you can tackle with them.
-
-
Literallynotpickles updated:
-
-
You can now equip handheld crew monitors on all medical-related winter coats.
-
-
Putnam3145 updated:
-
-
vore now ejects occupants on death
-
-
raspy-on-osu updated:
-
-
Thermoelectric Generator power output
-
-
timothyteakettle updated:
-
-
I.P.Cs now short their circuits when expressing emotion, causing sparks to appear around them.
-
-
-
24 August 2020
-
MrJWhit updated:
-
-
Fixes areas on expanded airlocks
-
-
silicons updated:
-
-
wormhole jaunters work
-
wormhole jaunters no longer get interference from bags of holding
-
airlocks now only shock on pulse/wirecutters instead of on tgui panel open.
-
-
timothyteakettle updated:
-
-
three new items are in the loadout for all donators
-
-
zeroisthebiggay updated:
-
-
contraband black evening gloves in kinkvend
-
-
-
23 August 2020
-
DeltaFire15 updated:
-
-
silicons and clockies can now access APCs properly
-
-
EmeraldSundisk updated:
-
-
Medbay now has a smartfridge for organ storage
-
Slight enhancements to the station's electrical wiring layout
-
Very small library renovation
-
Exterior airlocks have been given proper air systems for safety's sake
-
-
Ghommie updated:
-
-
Stops shielded hardsuits from slowly turning the wearer into a big glowing ball of stacked energy shield overlays.
-
the shielding overlay is merely visual as result. Aim your clicks.
-
-
Ludox235 updated:
-
-
no more 10 pop xenos (25pop now)
-
-
MrJWhit updated:
-
-
Increases the majority of airlocks by 1 tile.
-
Minor adjustments to the TEG engine.
-
-
Putnam3145 updated:
-
-
Simplemobs no longer count in dynamic.
-
"Story" storyteller no longer starts at a ludicrously low threat, always.
-
Blob threat now scales with coverage.
-
One person with their pref on no longer overpowers 40 people who might not even know there is one.
-
Negative-weight rulesets are no longer put into the list.
-
-
kiwedespars updated:
-
-
removed durathread from armwraps recipe.
-
-
lolman360 updated:
-
-
breath mask balaclava
-
-
timothyteakettle updated:
-
-
lizards are now a recommended species for mam snouts
-
-
zeroisthebiggay updated:
-
-
new sprites for the temporal katana
-
suiciding with the temporal katana omae wa mou shinderius you into the shadow realm
-
twilight isnt earrape
-
-
-
22 August 2020
-
Time-Green (copypasta'd by lolman360) updated:
-
-
plumbing
-
automatic hydro trays
-
-
-
21 August 2020
LetterN updated:
-
Updates and adds some of the tips
-
-
Putnam3145 updated:
-
-
added reftracking as a compile flag
+
No more liver damage when you opt out of "hornychems"
SmArtKar updated:
-
RSD limitation is now 500 tiles
-
Fixed broken RSD sprites
-
Removed that shuttle limit
+
Added a new TCG card game
+
+
dzahlus updated:
+
+
Removed maroon objective due to toxic gameplay behaviour
+
+
shellspeed1 updated:
+
+
floor bots place plating before tiles now.
+
gets rid of another tile duplication issue.
+
+
silicons updated:
+
+
priviledge --> privilege
+
+
+
16 February 2021
+
silicons updated:
+
+
sprint removal entry added, UI will revert to old UI while this is active.
+
+
+
15 February 2021
+
Adelphon updated:
+
+
polychromatic shoes
+
polychromatic windbreaker
+
polychromatic canvas cloak
+
digitigrade charismatic suit texture
+
+
DeltaFire15 updated:
+
+
Kneecapped pugilist parries somewhat.
+
Slightly nerfed default unarmed parries.
+
Slightly nerfed traitor armwrap parries.
+
Pugilist parries now cannot perfectly defend against projectiles, as they were supposed to.
+
Some parrying numbers that one would think were in seconds didn't have the SECONDS. I added those.
+
Clock cultists now yell alot less when invoking scripture.
+
+
dzahlus updated:
+
+
Added new emote
+
added a new emote sound
+
+
silicons updated:
+
+
people on the ground hit less hard in unarmed combat. rng miss remove from punches.
+
chat highlighting no longer drops half your entered words.
+
+
+
14 February 2021
+
DeltaFire15 updated:
+
+
The antag panel now correctly shows the names of cultist / clockcult datum subtypes.
+
Adding clock cultists via the admin panel now works correctly.
+
Xeno larvae should now be able to ventcrawl again.
+
+
Hatterhat updated:
+
+
Repairing sensors on jumpsuits now requires a fully-intact jumpsuit. Find some cloth.
+
Durathread armor kits now require you to have a fully-repaired jumpsuit, first, with no attachments.
+
Durathread armor kits now no longer weave the entirety of the jumpsuit armor universe into having armor.
+
+
TyrianTyrell updated:
+
+
added a define for multilingual granted languages, and changed the multilingual trait to use it.
+
+
+
13 February 2021
+
Hatterhat updated:
+
+
Energy bolas now take 2.5 seconds to remove and dissipate on removal.
timothyteakettle updated:
-
two snouts can once again be chosen in customization
-
lizard snouts work again
+
migration error to version 39+ of savefiles is now logged instead of messaging all online admins in the chat
-
20 August 2020
-
DeltaFire15 updated:
-
-
The cooking oil damage formula is no longer scuffed.
-
Changed the clockie help-link to lead to our own wiki.
-
-
Fikou updated:
-
-
admins can now do html in ahelps properly
-
+
12 February 2021
Hatterhat updated:
-
Pirate threats are now announced as "business propositions", and their arrivals are now also announced properly.
-
-
tiramisuapimancer updated:
-
-
Ethereal hair is now their body color instead of accidentally white
-
-
-
18 August 2020
-
DeltaFire15 updated:
-
-
kindle cast time: 15ds -> 25ds
-
Moved the Belligerent Scripture to where it should be in the code
-
-
Detective-Google updated:
-
-
glass floors
-
uncrowbarrable plasma floors tweak:disco inferno's plasma floors can no longer be crowbarred.
-
ghost cafe has funky fresh art
-
you can actually remove glass floors now
-
get_equipped_items is hopefully less gross
-
plasma cutters are no longer gay
-
-
Hatterhat updated:
-
-
Slaughter demons (and laughter demons, being a subtype) are MOB_SIZE_LARGE, with one of the more immediate effects being able to mark them with a crusher and backstab them.
-
The funny blyat men have stumbled upon another surplus of Mosin-Nagants and are starting to pack them into crates again.
-
Vehicle riders can now, by default, get shot in the face and/or chest.
-
Adminspawn only .357 DumDum rounds! Because sometimes the other guy just really needs to hurt.
-
Bluespace beakers now have a chemical window through the side that shows chemical overlays.
-
Plant DNA manipulators now let you chuck things over them. Or they WOULD, if LETPASSTHROW worked half a damn.
-
-
LetterN updated:
-
-
uplink implant states
-
tweaks how role assigning works
+
The ATVs on SnowCabin.dmm have been replaced with snowmobiles.
MrJWhit updated:
-
Gives ashwalkers nightvision
-
Makes tesla blast people, not the environment, to save the server.
-
-
TheObserver-sys updated:
-
-
moves Garlic sprites from growing.dmi to growing_vegetable.dmi
-
Removes the unused Electric Lime mutation, it just takes up space with no actual function nor sprites.
-
Gives Catnip growing sprites
-
Removes redundant images in growing.dmi
-
-
kiwedespars updated:
-
-
10 force to a fucking rubber cock.
-
-
lolman360 updated:
-
-
shotgun stripper clip nerf. ammoboxes can now accept a load_delay that happens when they attack a magazine, internal or external.
-
-
ported from tg updated:
-
-
bronze airlocks and windows can now be built
-
i also tweaked bronze flooring to be cheaper.
+
Random deltastation fixes.
+
Gives boxstation vault door actual vault door access
silicons updated:
-
stamina draining projectiles without stamina for their primary damage type now has their stamina damage taken into account for shield blocking, rather than the block being done for free for that.
-
-
timothyteakettle updated:
-
-
snowflake code tidyup
-
snowflake code for mutant bodypart selection has been rewritten to be ~14x shorter
-
meat type and horns can now be selected by any species
+
Voice of God - sleep removed, stun staggers instead, knockdown is faster but does not do stamina damage, vomit is faster but doesn't stun
-
17 August 2020
+
11 February 2021
+
Adelphon updated:
+
+
Charismatic Suit
+
Urban Jacket
+
DeltaFire15 updated:
-
Cogscarabs are no longer always Pogscarabs
-
-
Strazyplus updated:
-
-
Added drakeborgs
-
Added drakeplushies
-
added drakeborg sprites
-
added drakeplushie sprites
-
changed some code - added drakeplushies to backpack loadout Removed duplicate voresleeper belly sprites from engdrake & jantidrake. [CC BY-NC-SA 3.0](https://creativecommons.org/licenses/by-nc-sa/3.0/)
-
Added CC BY-NC-SA 3.0 license details to icon/mob/cyborg moved drakeborg.dmi to icon/mob/cyborg
-
-
-
16 August 2020
-
kiwedespars updated:
-
-
nerfed hypereut chaplain weapon.
-
50% rng blockchance -> 0%
-
parry made much worse because it's an actual weapon and a roundstart one at that.
-
-
zeroisthebiggay updated:
-
-
tips
-
-
-
15 August 2020
-
LetterN updated:
-
-
missing anomaly core icons
-
wrong state. blame the tg vertion i copied
-
-
silicons updated:
-
-
the 8 rotation limit from clockwork chairs has been removed. please don't abuse this.
The temporal katana is now slightly more worthy of the 2 spell point cost, with a smaller, antimagic respecting timestop, less force, and no random blockchance. Society has progressed past the need for blockchance.
-
-
LetterN updated:
-
-
Mafia Component
-
Fixed missing icons and handtele
+
Added nanogel to the robodrobe.
Putnam3145 updated:
-
a whole lot of jank regarding funny part sprite display.
+
Config to keep unreadied players from mode voting
-
Toriate updated:
+
dzahlus updated:
-
Opossums have migrated into the maintenance tunnels! Seek them out at your own peril!
+
fixes grenadelaunch.ogg being used where it shouldn't and makes mech weapons use correct sound
-
ancientpower updated:
+
keronshb updated:
-
Doors added to the west side of box medbay to make things a bit more manageable.
-
-
kappa-sama updated:
-
-
smuggler satchel cost 2->1
-
radio jammer cost 5->2
-
smuggler satchel uplink description now implies that persistence is disabled
-
-
lolman360 updated:
-
-
renameable necklace (accessory, attaches to suit) and ring (glove slot.)
-
custom rename is now 2048 characters? i think it's characters.
-
-
silicons updated:
-
-
You can now use anything as an emoji by doing :/obj/item/path/to/item:. This works for any /atom or subtype.
+
10 > 30 second for Warp Implant cooldown
+
Comments out power sink objective.
timothyteakettle updated:
-
syndicate agents now have access to mechanical aim enhancers which allow them to aim bullets to bounce off walls
-
ricochets work properly now for the bullets that support them
+
persistent blood should stop being invisible and alt clicking it shouldn't return the entire spritesheet
+
pickpocketing is now logged using log_combat
zeroisthebiggay updated:
-
hair and some sechuds
-
ce hardsuit radproofing
+
the aesthetic sterile mask no longer hides faces so you can cosplay egirls and keep flavortexts
-
11 August 2020
-
Hatterhat updated:
+
09 February 2021
+
Chiirno updated:
-
PDA uplinks can now steal from pens. Properly. Just make sure to have a pen in your PDA, first.
-
-
kappa-sama updated:
-
-
tracer no longer gives you full stamheals per use
-
-
zeroisthebiggay updated:
-
-
volaju two
-
-
-
10 August 2020
-
Hatterhat updated:
-
-
Parry counterattack text now shows up.
-
Sterilized gauze is now better at stopping bleeding, and applies slightly faster. Very slightly faster.
-
Ointment and sutures now hold more in a stack (12 and 15, respectively).
-
Sterilized gauze can now be made by just pouring 10u sterilizine onto standard medical gauze, instead of having to craft it. Why you had to craft it, I will honestly never know.
-
Proto-kinetic glaives are more expensive, stagger/cooldown on failed parries increased slightly, perfect parries required for counterattack.
-
New item: Temporal Katana. 2 points for wizards, timestops upon successful parry, bokken quickparry stats (100 force on melee counter!).
-
Also you can *smirk. This has no mechanical effect, other than being smug.
-
-
KeRSedChaplain updated:
-
-
Added a guide for romerol usage
-
made infectious zombies not enter softcrit and take no stamina damage
-
-
LetterN updated:
-
-
clocktheme color
-
Ports TGUI-4
-
-
Lynxless updated:
-
-
Ports TG #51879
-
-
Owai-Seek updated:
-
-
Meatballs now spawn raw from food processors.
-
-
Putnam3145 updated:
-
-
Ethereals
-
(Hexa)crocin
-
(Hexa)camphor
-
Tweaked wording for marking tickets IC issue.
-
Rerolling your traitor goals will ONLY give you "proper" objectives.
-
-
Seris02 updated:
-
-
borgs being able to select and use a module when it's too damaged
-
-
Sishen1542 updated:
-
-
gave chairs active block/parry in exchange for removal of block_chance
-
replaces box whiteship tbaton with truncheon
-
-
kappa-sama updated:
-
-
made the Dirty Magazines crate cost 4000 instead of 12000 credits
-
MODS I SPILLED MU JUICE HEJPPHRLP HELPJ JLEP HELP
-
-
silicons updated:
-
-
player made areas are no longer valid for malf hacking
-
default space levels is 4 again.
-
rats now swarm instead of stacking on one spot.
-
getting hit by an explosion will now barely hard knockdown, but will leave you somewhat winded.
-
-
timothyteakettle updated:
-
-
speech verbs copy through dna copying now
-
-
-
09 August 2020
-
Hatterhat updated:
-
-
Proto-kinetic glaives (not crushers) can parry now.
+
Adds clown waddle to clown shoes. Enhanced Clown Waddle Dampeners can be engaged in-hand with ctrl+click, _but why would you?_
MrJWhit updated:
-
Adds a second shutter on the top of the hop line
+
Re-adds theater disposal outlet, and makes dorms disposal able to have things sent to it on boxstation.
+
+
TyrianTyrell updated:
+
+
made default tongue able to speak signed language.
+
+
timothyteakettle updated:
+
+
sentient viruses can now infect synths and ipcs
+
+
+
07 February 2021
+
Thalpy updated:
+
+
Dispenser: Adds the ability to store a small amount of reagents in the machine itself for dispensing. Reacting recipies cannot be stored. Size of storage increases with bin size.
+
Dispenser: Allows reagents to be color coded by pH
+
Dispenser: Each reagent displays it's pH on hover
+
Dispenser: Allows the user to toggle between buttons and a radial dial
+
Dispenser: When the dispencer is upgraded it can dispense 5/3/2/1 volumes based on rating refactor: Dispenser: as it was before. This does not break recorded recipes.
+
Adds a round function to some numbers so they're not huge
+
The Chem master can now get purity for all reagents when analysed
+
Synthissue fixes
+
buffers now have a strong and weak variant. Weak can be dispensed, and strong can be created. Strong buffers are 6x more effective.
+
Some buffer pH edge calculation fixes
+
+
TyrianTyrell updated:
+
+
added a signed language, that can't be used over the radio but can be used if you're mute. also added the multilingual trait.
+
hopefully added an icon for the signed language.
+
changed how some traits function slightly.
+
+
dzahlus updated:
+
+
tweaked a few sounds
+
added a new weapon sounds
+
removed old weapon sounds
+
changed some sound related code
silicons updated:
-
immovable rods no longer drop down chasms
-
fun removal: squeaking objects now have an 1 second cooldown between squeaks, and will have a 33% chance of interrupting any other squeaking object when Cross()ing, meaning no more ear-fuck conveyor belts.
+
syndicate ablative armwraps have been added.
-
08 August 2020
+
05 February 2021
+
SmArtKar updated:
+
+
The orbit menu now has an Auto-Observe button! No more sifting through the lame observe menu to snoop in people's backpacks! Also, orbit menu now refreshes.
+
KAs are no longer getting broken when fired by a circuit
+
+
keronshb updated:
+
+
Force and damage > 15 from 18/25
+
Knockdown put down to 5 from 30
+
Armor pen down to 10 from 100.
+
Makes cell chargers, charge faster.
+
+
raspy-on-osu updated:
+
+
alien royals can no longer ventcrawl
+
+
shellspeed1 updated:
+
+
There actually needs to be people for zombies to happen now.
+
+
timothyteakettle updated:
+
+
dwarf facial hair is no longer randomised
+
+
+
03 February 2021
+
Hatterhat updated:
+
+
The green energy sabre's sprite now respects proper handedness.
+
+
+
02 February 2021
+
silicons updated:
+
+
pais can now be carried around piggybacking/fireman
+
Meth and Nuka Cola once again, speed you up.
+
+
+
31 January 2021
+
Putnam3145 updated:
+
+
fermichem explosion EMPs don't cover the entire station
+
+
+
30 January 2021
+
timothyteakettle updated:
+
+
adds 'clucks', 'caws' and 'gekkers' to the speech verb list
+
+
zeroisthebiggay updated:
+
+
some more FUCKING hairs
+
uncodersprites the advanced extinguisher
+
+
+
29 January 2021
+
MrJWhit updated:
+
+
Ported the QM, Captain, CMO, and HoS cloaks from beestation.
+
Removes excess air alarms from boxstation
+
+
TripleShades updated:
+
+
fixes engineering secure storage being the wrong area because I fucked that up previously my bad
+
removes funny extra light switch under right surgery table in surgery oops
+
Added chairs to the corpse launch viewing area
+
Small garden plot for flowers for parity with other station Chapels
+
Plain Bible to glass tables in Chapel
+
Candles and Matchbox to glass tables in Chapel
+
More glass tables, with a chaplain figure and another spare bible.
+
Bookcase to Box Chapel for parity with other station Chapels
+
Minimoog to Box Chapel as substitute for a church organ
+
Holy department sign just below Chapel change: Expanded the corpse launching area to feel less congested change: Added windows to the corpse launch so you can look inside I guess? change: Moved flowers and burial garments to the corner next to the corpse launcher change: Box Chaplain's office door is moved over one change: Confessional is now connected to Chaplain's office for parity with other station Chapels change: Moved coffins over to old confessional location change: Box Chapel now has pews instead of stools change: Box Chapel Confessional is now lit instead of being nearly pitch black remove: Two coffins from Chapel
+
+
timothyteakettle updated:
+
+
the miner bedsheet will now increment its progress when you redeem points from the ORM
+
you can add custom names and descriptions to item's on the loadout now
+
+
zeroisthebiggay updated:
+
+
roundstart aesthetic sterile masks and roundstart paper masks
+
more accessory slot items
+
cowbell necklace happy 2021
+
shibari ropes & torn pantyhose
+
+
+
28 January 2021
+
silicons updated:
+
+
colormates can now paint some mobs.
+
1 dev explosions shouldn't delete brains anymore
+
+
+
27 January 2021
+
ArcaneMusic, ported by Hatterhat updated:
+
+
Strike a hydroponics tray with a fully-charged floral somatoray to lock in a mutation.
+
Floral somatorays now have the ability to force a mutation in a plant. This should drain the cell in a single shot, but we'll see.
+
Somatorays now take uranium to craft instead of radium.
+
+
Arturlang updated:
+
+
Actually adds a right click give option
+
Revenants can now clickdrag to throw stuff at people, with some items doing various things at the same time.
+
DeltaFire15 updated:
-
Roundstart cultists now start with a replica fabricator - no brass though, make your own.
-
Kindle cast time: 10 > 15, mute after stun end: 2 > 5, slur after mute end: 3 > 5
-
The ratvarian spear no longer adds negative vitality under very specific circumstances.
-
The Ratvarian Spear can parry now! Short parries with low leeway, but low cooldown.
-
The brass claw, a implant-based weapon which gains combo on consecutive hits against the same target.
-
The sigil of rites, a sigil used to perform various rites with a cost of power and materials
-
The Rite of Advancement: Used to add a organ or cyberimplant to a clockie without need for surgery.
-
The Rite of Woundmending: Used to heal all wounds on another cultist, causing toxins damage in return.
-
The Rite of the Claw: Used to summon a brass claw implant. Maximum of 4 uses per round.
+
The woundmending rite no longer causes runtimes.
+
Ratvarian borgs can now use their tier-0 spells.
+
Ratvarian borgs can always use their assigned spells, if there is enough power.
+
The heretic antag panel now shows their sacrifices & current sacrifice targets.
+
The heretic roundend report now shows their sacrifices and nonsacrificed targets.
+
Living hearts can no longer select the same target as another living heart, removing a certain problem.
Hatterhat updated:
-
You can now buy a toolbox's worth of Mosin-Nagant ammo for a fairly discounted price.
-
Revolvers from the dedicated kit now have reskinning capabilities.
-
You can now actually buy the riflery primer, which lets you pump shotguns and work the Mosin's bolt faster.
-
Bulldog slug magazines now have a unique sprite.
+
Department budget cards have been readded. TO THE CODE. NOT LOCKERS.
+
Also budget cards now look more like every other ID - see tgstation#55001.
+
One of the contractor tablet's payouts has been raised from a small payout to a medium payout.
+
The free golem ship's GPSes no longer start on. They were never meant to, but they did.
+
Headsets can't be found on most legion corpses now.
+
The flash on the assistant corpse is gone, too.
-
Ludox235 updated:
+
MrJWhit updated:
-
Removed an abductee objective that told you to remove all oxygen.
-
Added a new abductee objective to replace the removed one.
+
Remaps some air alarms for sanity.
-
Sishen1542 updated:
+
SandPoot updated:
-
🅱️oneless
-
squishy slime emotes
+
The drop circuit can no longer drop things that are not inside it.
+
+
raspy-on-osu updated:
+
+
bespoke ventcrawling element not detaching due to malformed call
+
+
shellspeed1 updated:
+
+
Floorbots had had a software update, preventing them from dogpiling on their target as easily as they did before.
+
Floorbots will now play a small chime when stacked on top of each other to indicate that they're moving apart.
timothyteakettle updated:
-
heparin makes you bleed half as much now
-
cuts make you bleed 25% less now
-
more items in the loadout and loadout has subcategories now for easier searching
+
blobs can use the 'me' verb
+
adminhelps and pms only sanitize once instead of twice
-
07 August 2020
-
dapnee updated:
+
25 January 2021
+
MrJWhit updated:
-
fixed active tufs on some space ruins, murderdome VR, and a few on pubby, changed cargo autolathe to techfab, messed with pipe room leading to monastery.
+
Alien radio code
+
Microwave can now be cleaned by a damp rag as well as soap.
+
Removes some unused code, and improves some other code.
+
The AI has a verb to look up and down z-levels
+
Making a monkey into a human doesn't unanchor random things on the tile
+
Makes a few slight improvements to drinking code
+
Makes encryption keys be put in the hands of the user when able instead of being dropped on the floor when removed from headsets
-
lolman360 updated:
+
raspy-on-osu updated:
-
vendors are now unanchored when tipped. it just fell over it's not bolted to the ground anymore.
-
podpeople no fat when sunbathing.
+
ventcrawling
silicons updated:
-
explosions only recurse one level into storage before dropping 1 level per storage layer.
-
volumetric storage is now minimum 16 pixels per item because 8 was ridiculous
-
shieldbash balanace --> balance
-
attempting to send too long of an emote will now reflect it back to you instead of cutting it off and discarding the overflow.
-
holoparasites can now play music
-
lethal blood now causes damaging bleeding instead of outright gibbing
+
you can now shove yourself up in any intent, not just help.
-
06 August 2020
-
Auris456852 updated:
+
22 January 2021
+
Arturlang updated:
-
Added B.O.O.P. Remote Control cartridges to the PTech.
+
Adds a way to give items to people, you can combat mode rightclick to offer it to one person, right click on people without mode and click the give verb, or use the hotkey CTRL G to offer it to everyone around you
+
+
+
21 January 2021
+
Acer202 updated:
+
+
Main mining shuttle should no longer look at the public mining shuttle and attempt to dock ontop of it. Monastery shuttle should now function again.
+
+
Acer202, with minor help from The0bserver updated:
+
+
After internal deliberation, CentCom has decided to run a limited reinstatement of public mining shuttles for use in more tried and true station classes. CentCom would like to remind you that this privilege is easily revoked, and that abuse may result in immediate detonation.
+
Restores the mining shuttle on Pubby, Box, Delta, Meta, and Lambda Station.
+
+
ArcaneMusic, The0bserver-sys updated:
+
+
New from Hydrowear LLC: The Botanical Belt! This handy yellow belt lets you hold most of your botany gear, and a few beakers for reduced bag and floor clutter!
+
Gives Hydrotrays plumbing pipes automatically, allowing you to make a self sustaining tray via plumbing.
+
Gives Service access to Bluespace Beakers, at last, gives Cargo, Science, and Medical the ability to construct reinforced plungers for use on lavaland.
+
+
ArchieBeepBoop updated:
+
+
Upgraded Advanced RTG Machine Preset
+
Outlet Injector Mapping Asset Layer Fix
+
Jacqueen and the Christmas tree should no longer spawn abstract things that can cause shittons of runtimes.
+
+
Arturlang updated:
+
+
You can't tackle in nograv anymore
+
You cannot spam drink from blood bags anymore
+
Blood bag drinking inefficiency is now the right way, so you loose some of the blood drinking it straight
+
Handles more edge cases with construct soul returning
+
Being sacrificed by the cult no longer removes all hope of rescue.
+
Makes construct mind returning more robust
+
Prayers to admins now do a wee ding sound for all prayers, instead of just chaplains
+
Fixes the mint machine's UI
+
Hopefully fixes whitescreen issues for TGUI UI's by giving assets more time to get to the client
+
Fixes hijack implant APC UI, again
+
Comments out spaceman dmm do not sleeps for mob/proc/CommonClickOn, atom/proc/attack_hand, datum/proc/keyLoop and mob/living/proc/Life
+
Bloodsuckers tresspass ability can no longer work while they are not awake.
+
The cursed heart now only takes away half as much blood every loop, and can be used as long as you are alive, instead if only you are awake/able to use your hands
+
+
Bhijn updated:
+
+
Changeling loudness is now determined as an average of all their abilities, rather than the sum
+
To compensate for this, blood tests now require a loudness value of 1 or higher to detect ling blood. Additionally, blood test explosions are now triggered only when the loudness value is higher than 2.
+
+
BlackMajor updated:
+
+
Cyborg hypospray no longer injects if it means OD'ing while on help intent.
+
+
BlueWildrose updated:
+
+
Nyctophobia quirk now has some light lag compensation.
+
Fixes cloning computer UI not updating when pressing certain buttons - also adds extra check for names to update a message
+
Removes oversized genitalia analysis from medical scanners, since huge dick and titty are no longer a problem anymore thanks to advancements in that kind of technology when it comes to chemical fun times growth.
+
Fixed species-specific drinks not giving a mood boost if you are that species.
+
You will now only unbuckle fireman-carried/piggybacked people on disarm or harm intent.
+
The traitor AI can no longer activate the doomsday device while carded.
+
Fixes noodle size appearance for 12+ inch members.
+
Fixed the subtle hotkey being weird with its input prompts.
+
Adds a subtler anti-ghost hotkey. Default key is 6.
+
No more straining when your cock or breasts are growing via incubus draft or succubus milk.
+
PubbyStation now has two Christmas Tree spawners.
+
You can now have a max-roundstart-dicksize-config inch long johnson before you start suffering blood loss and slowdowns instead of a 20 inch one.
+
Color Mates have been added to all stations (except Snaxi). Enjoy coloring your attire without having to bug science!
+
Polychromic hoodies that were obtained from the loadout have functional colorable hoods now.
+
Adds in timid woman/man costumes. Available at your autodrobe! Also adds in garters as some new socks.
+
Corrected the capitalization in gasmask concealment examine text
+
+
Chiirno updated:
+
+
Added the paramedics EVA suit as a purchase from the cargo console.
+
Paramedics office and Surgery Storage Room
+
Remodeled the surgery room, as well as shrunk Morgue and Starboard Emergency Storage. Fiddled with some areas for better map edit clarity and fixed one runtime in Vacant Office A.
+
Added the paramedic closet sprite, a paramedic colored medical3 closet.
+
Added a paramedic closet, which is the standard medical3 closet with their suit, a pinpointer, and a crew monitor added.
+
Nightmare now deals additional damage to most light sources.
+
Nightmare now one-shots miners beacons and glowshrooms
+
Portable Chem Mixer now researchable from biotech node.
+
Chem masters can now dispense 20 instances of its outputs instead of 10.
+
+
Delams-The-SM updated:
+
+
Added 3 new emotes *hiss *purr *meow
+
ported sounds from Citadel RP for *purr and *meow
+
fixed randomization of colors for things like mulligan and Stabilized green slime extract for matrixed body parts
+
+
DeltaFire15 updated:
+
+
Biomechanical (hybrid) bodyparts now have access to wound-fixing surgeries.
+
A wound being fixed no longer just qdel()s surgeries connected to it.
+
Some robotic surgery steps are now a bit more clear.
+
Organs no longer get fed to people after successfully being inserted into them.
+
Not completing the do_after of a surgery no longer causes you to attack the target with whatever you were holding.
+
IPC cells & power cords are now printable after they are researched.
+
A new surgery, allowing revival of synths without a defib at hand.
+
Semi-permanent damage of Synth limbs caused by passing the damage threshold: 10 <- 15.
+
The embed removal surgery now has a version for Synths.
+
EMPs no longer hardstun Synths.
+
Portals no longer runtime because of incorrect args.
+
Abductors now can use experimental organ replacement surgery on robots / synthetics.
+
Fixes a minor incorrectness in ratvarian borg slabs (ratvar_act -> ui_act)
+
Changelings no longer double-deathgasp when activating the regen stasis ability while not dead.
+
People installing KA modkits in miner borgs is no longer broken.
+
Fixes the tail entwine messages displaying incorrectly.
+
Antagging / Deantagging Heretics now properly sets their special role.
+
The borg VTEC ability now actually gets removed when the upgrade is removed.
+
Supplypods shouldn't cause runtimes anymore, and shrapnel (pelletclouds) should work for them.
+
Robots (anyone with the robotic_organism trait) have toxins damage replaced with system corruption. See the PR for details.
+
Clockwork rites now support hiding specific rites from neutered servants.
+
AIs now only have to kill people once instead of permanently.
+
Scripture no longer sometimes eats part of its invocation.
+
APCs and silicons are now more susceptible to powerdrains (by the power_drain() proc, which is rare)
+
Void Volt has been modified from a chant to a singular pulse.
+
Robotpeople are now fully immune to the effects of alcohol (drunkness etc.)
+
Renames the alcohol intolerance trait in the code to make what it does more clear.
Brass welders now actually recharge faster than experimental ones.
+
Repeatable surgery steps can no longer cause an infinite loop if not completing the do_after
+
The Revenant self-revive ability is no longer broken.
+
Loot items mobs drop are no longer always failing to initialize.
+
Instant summons can no longer do wacky stuff with disposals (and nukes).
+
Objectives are no longer very broken.
+
Bloodcult stunhands now work against clockies like they were supposed to instead of hardstunning.
+
zeolites are now actual fermichems instead of being incredibly easy to make.
+
Using syringes / droppers on chem heaters with beakers in them works again.
+
Some edge cases causing issues with system corruption shouldn't be able to occur anymore.
+
Cyborg B.o.r.i.s. installation now checks for if the chest has a cell, just like how it does with MMIs.
+
The 'Your body is in a cloner' notification works again
+
Hijack implants should work properly again (or, at least better)
+
Liches are now good skeletons again instead of weak ones
+
The piratepad control cannot be destroyed again.
+
Pirates have received new supplies of jetpacks instead of useless oxygen tanks
+
Ratvarian AIs are once again able to show their linked borgs Ratvar's light
+
Hijackers are once again unable to detonate borgs without being adjacent to the console
+
Automated annoucement systems and gulag ore consoles no longer waste emag charges
+
Automated announcement systems once again can be remote controlled by non-AIs with silicon access
+
APCs being hijacked multiple times at once is no longer possible, preventing some issues
+
Recharging APCs no longer use 0.2% of the power they should be using.
+
APCs no longer always use as much power as they can for their cell, even if it is full.
+
Vampire shapeshifting should now behave as intended
+
Some synth damage stuff has been a bit rebalanced, see the PR for details.
+
Nanogel, available at medical and robotics, which fixes internal damage in sufficiently repaired robotic limbs.
+
Robotic Limbs now each have their own damage threshhold values
+
Robotic Limb damage threshholds are now seperated into threshhold itself and mindamage when passed balance; Hybrid limbs can now be injected with hypos, but not sprayed (Still not healed by chems)
+
Brain surgery has been tweaked back to allowing robotic limbs, blacklisting IPC brains instead.
+
Robot brain surgery can now be used on organic heads, if there is a IPC brain in them somehow.
+
The robot limb heal surgery can now be used even if the target's torso is not robotic, as long as they have robotic limbs
+
BODYPART_ROBOTIC / BODYPART_ORGANIC checks replaced with helper-procs whereever possible.
+
Added a BODYPART_HYBRID define for robotic bodyparts that behave organic in some regards.
+
The transmission sigil power drain works now
+
A certain lizard (totally not me) being stupid is no longer going to break regenerate_bodyparts
+
Combat mode now will not stay permanently disabled due to status effects not working as intended.
+
Attacking some certain objects no longer has no clickdelay.
+
the blacksmithing skill now works properly
+
Anvils cannot be interacted with with hammers whilst they are already being used
+
If someone has no gloves when interacting with heated ingots, they no longer ignore their effects.
+
A runtime caused by hallucinations is gone.
+
Cargo packs marked as 'no private buying' now actually register as such.
+
Fleshmend, Anatomic Panacea and bloodsucker healing now work for Synths / IPCs.
+
Medibots now ignore people they cannot help due to their biology.
+
get_damaged_bodyparts() is no longer broken.
+
Your target cryoing will no longer give you a free greentext.
+
Sleeper UI interactiveness now behaves correctly.
+
+
Detective-Google updated:
+
+
arcade carpet
+
explosions now get broadcasted to deadchat.
+
Lick radial
+
Hilbert's jukebox works
+
arcade carpets now actually work
+
the snow taxi is no longer the slow taxi
+
+
ERP mains updated:
+
+
Subtler Around Table is now a verb
+
+
EdgeLordExe, MoonFalcon updated:
+
+
Ported a bunch of heretic-related tweaks and changes from tg
+
+
EmeraldSundisk updated:
+
+
Adds a few new area designations primarily for CogStation, incorporates them into said map
+
Reorganizes some area designations for ease of use, along with renaming the central "Router" to "Routing Depot"
+
Fixes an incorrectly designated area in CogStation
+
Changes the area designations to be not varedited since the code didn't like that anymore
+
The cargo bay conveyor belts not only work with the shuttle now but go in the right direction to boot
+
Slight visual adjustments to cargo in light of this
+
The arcade's got RAD carpet now
+
Fixes the conveyor belt issues in Delta Station's cargo wing
+
Removes some of the dirt around the affected area (presumably they would have cleaned it up while working on it)
+
Adds a floor light to fix the "dark spot" cargo had
+
Adds a new "Computer Core" area designation for CogStation
+
Fixes some missing area strings
+
Replaces some firelocks with directional ones as to ensure desks/counters can still be accessed
+
The "Skelter ruin" now has stechkins as opposed to M1911s
+
Skelter's decorative bullet casings replaced to factor in the change in caliber
+
Skelter now has a combat knife and fluff note
+
+
Ghommie updated:
+
+
You can access the mime / clown mask skins radial menu once again.
+
Dice bags no longer act like cardboard boxes.
+
Abductors should be no longer mute.
+
Item action buttons should now properly show the item current overlays, most times.
+
The blackbox should now go into your hand slot when pried out, rather than tumbling on the ground everytime.
+
The Quick Equip hotkey is now usable by all living mobs (so long they have hands and equipment slots)
+
+
Ghommie, porting PRs by MMMiracles and pireamaineach, credits to BlueWildrose too. updated:
+
+
You can now draw on plasmaman helmets with a crayon to turn their frown upside-down.
+
Plasmaman helmets no longer hide your identity when worn by themselves.
+
Plasmaman helmets now have welding visors, which can't stack with their torches in the helmet and are visible.
Hatterhat updated:
-
Proto-kinetic glaives! Essentially a proto-kinetic crusher with a different blade, handguard, and goliath hide grip. Expensive, but elegant.
-
Door charges no longer knock people out.
+
Energy sabre reskin for the energy sword - access via alt-click.
+
Alt-click reskins are fixed.
+
Defibrillators and their many, many overlays were moved to another .dmi.
+
You can now change the color of an energy sword via multitool. Not deswords. Yet.
+
The Syndicate appear to be issuing new revolver variants.
+
Basic sticky technology is now a roundstart tech. Advanced sticky technology is BEPIS-locked, though. Theoretically.
+
Non-smithed katanas (including the temporal katana) can now fit in the twin sheath.
+
Cotton and durathread processing by hand now acts like grass. Stand on a pile of cotton (or durathread) and use a single bundle from it.
+
Utility uniforms now comply with the "nonproper equipment names" thing.
+
The CapDrobe now allows the captain to get his own clothes for free. Probably.
+
All captains' clothes now offer 15 woundarmor, up from the 5. Because apparently only the suit and tie and its suitskirt subtype have this wound armor, which is dumb.
+
The nature interaction shuttle with the monkeys now has tiny fans on the airlocks in, because that's apparently a feature that was missing.
+
More bags have been added to department vendors.
+
Every roundstart species (and also ash walkers) now has flesh and bone that can be wounded.
+
Recipes for sutures, regen mesh, and sterilized gauze have been adjusted to be easier, mostly.
+
Sterilized gauze is better at absorbing blood and being a splint.
+
Energy sabres now have an off inhand.
+
The bone gauntlets should be slightly less murderously punchy on the fast punches mode.
+
RPEDs now drop their lowest part tier first when quick-emptied (used inhand).
+
Improvised gauzes can now be crafted in stacks up to 10, like their maximum stacksize implies they should be capable of doing.
+
Pouring sterilizine on gauze now takes the proper 5u per sterilized gauze instead of 10u.
+
Cryogenics now screams on common again when your fuckbuddy heads out.
+
Survival daggers! A slightly more expensive survival knife that comes with a brighter flashlight. On the blade.
+
Luxury pod capsules look different from normal capsules.
+
The wastes of Lavaland and the icy caverns of Snow Taxi rumble in unison.
+
Exosuits sold on the Supply shuttle no longer leave wreckages.
+
Apparently, shrink rays were buyable again, despite a PR having been made a while ago specifically for removing shrink rays. They're gone again.
+
Changeling bone gauntlets! They punch the shit out of people really good.
+
Guerilla gloves and gorilla gloves inherit the strip modifiers of their predecessors, because apparently they had those.
+
Pugilists now always hit the targeted limb and never miss.
+
The dock-silver standard set by Box and Meta has been enforced across maps in rotation (Delta, Pubby, Lambda).
+
The Box whiteship now has its missing tiny fan back.
+
The survival dagger light on the sprite now actually turns on and off.
+
The survival dagger in the glaive kit that can also be bought by itself is now better at butchering things.
-
Ludox235 updated:
+
HeroWithYay updated:
-
You can now buy damaged AI upload modules in the traitor's uplink.
+
Changed description of Necrotizing Fasciitis symptom.
+
Wormhole Projector and Gravity Gun now require anomaly cores to function instead of firing pins.
-
Seris02 updated:
-
-
fixed ghost chilis
-
-
Trilbyspaceclone updated:
-
-
4 New blends of tea have been shipped to the station, and how to make them has been leaked!
-
-
b1tt3r1n0 updated:
-
-
Added the warp implant
-
-
dapnee updated:
-
-
added a hallway to telecoms for engineers to get there on meta
-
-
kappa-sama updated:
-
-
dildo circuit assemblies
-
-
lolman360 updated:
-
-
The Tendril-Mother on Lavaland has remembered how to make ashwalkers who know how to speak Draconic again.
-
-
timothyteakettle updated:
-
-
nanotrasen has decided to fire all disabled members of the security division and confiscate certain sentimental items from doctors
-
the custom tongue preference now passes through cloning so you spawn with your selected tongue
-
several changes to travelling traders so they look better and spawn slightly less often
-
-
zeroisthebiggay updated:
-
-
nukies can buy holoparasites
-
-
-
04 August 2020
-
Seris02 updated:
-
-
lizard spines
-
-
timothyteakettle updated:
-
-
due to further advancements in medical technology, you can now have holes poked into your body for fun and enjoyment
-
-
zeroisthebiggay updated:
-
-
prefs for headpat wagging
-
-
-
03 August 2020
KeRSedChaplain updated:
-
fixed clockwork guardians being able to reflect ranged weapons
entertainment monitors now light up and display text when motion is detected in thunderdome
+
lizard snouts are no longer *slightly* lighter than they are supposed to be.
-
dapnee updated:
+
MrJWhit updated:
-
active turfs on box and xenohive, maintenance bar APC not being stringed correctly, turned a monitor to face a direction that makes sense, changed tag of camera in gravgen being misnamed
+
Expanded space hermit base
+
Replaced engineering fuel tank with a large fuel tank
+
Changed access to sec suit storage from armory access in every map to other security access
+
Adds a space loop to every map in toxins
+
+
Added the ability for cargo to buy a large welding tank
+
Tweaked large tank reagent sprites to /tg/'s
+
Gives metastation toxins storage a scrubber and a vent
+
Updates suit storage info on Tip Of the Round.
+
Increased christmas event from 22th to 27th to 10th to 27th
+
Removes an opposum from the wall
+
Donut boxes show what's inside of them now
+
Updated meat icons
+
Canceling events gives more time to stop from 10 to 30
+
Fixes two chairs on one table
+
Removed the wires connecting the AI from the rest of the station on cogstation.
+
Fixes experimenter on cogstation.
+
Less pipes in the overall area in toxins on cogstation
+
Small fixes on security on boxstation
+
Updated jukebox sprite.
+
Fixes maint area in boxstation
+
Christmas starts on the 18th now
+
Adds a goose bar sign
+
Effects can no longer trigger landmines
+
Removes the screen flashing on climax.
+
Makes gas sensors fireproof.
+
A small bucket of random fixes,
+
Minor fixes to kilo
+
Porting garbage collection tweak from /tg/
+
Updates our dark gygax sprites to /tg/'s
+
Bugfix of a morph becoming an AI eye
+
Mining station oxygen locker on the cycling airlock starts out wrenched.
+
Nerf combat knife damage
+
Code improvement on ventcrawling
+
+
NT Cleaning Crews On Break updated:
+
+
Most kinds of dirt, grime, and debris are now persistent. Get to work, jannies.
+
Dirt can now be removed by tile replacements. Other cleanable decals can't, though.
+
+
Putnam3145 updated:
+
+
Replaces majority judgement with usual judgement.
+
Toilet loot spawners don't lag the server on server start with forced hard dels.
+
vore prefs save now
+
gear harness no longer magically covers up the body mechanically despite covering up nothing visually
+
Regen coma now puts into a coma even from crit or while unconscious.
+
Regen coma now properly weakens while asleep.
+
Multi-surgery unit test no longer fails at random.
+
Dwarf speech is no longer absolutely paranoid about word replacement.
+
Spontaneous brain trauma now requires minimum 5 players
+
Grab bag works as advertised.
+
Xeno threat in dynamic tripled.
+
Vote system #defines are now strings
+
Stat panel UI for ranked choice votes
+
A fallback for dynamic antag rolling that allows for it to just try between traitor, blood brothers, heretics, changeling, bloodsucker and devil until there are enough roundstart antags. This can also happen randomly anyway. Blood brothers and devil are disabled for now, but the code is there to enable them.
+
A new storyteller, "Grab Bag", that forces the above round type.
+
atmos subsystem no longer dies if there's too many gases
+
Emotes can properly be filtered for in TGUI.
+
Holofirelocks work now.
+
adminhelping no longer removes entire admin tab
+
end of round no longer removes entire admin tab
+
Fixed a runtime in every healing nanite program.
+
removed a unit test causing master to fail
+
Planetary atmos no longer does superconduction.
+
Dynamic vote no longer shows the none-storyteller.
+
You can now exit polycircuit input
+
Polycircuits now check for range
+
gear harness alt-click is now sane
+
rolldown() and toggle_jumpsuit_adjust() now no longer mix behavior-that-should-be-overridden and behavior-that-shouldn't-be-overridden in ways that make no sense.
+
Gear harness now covers nothing.
+
Chemical stuff now displays fermichem stuff properly
+
Rad collectors now get 1.25x as much energy from radiation
+
Rad collectors now put out 1.25x as much stored energy per tick
+
Above two rad collector changes give a total 56.25% power output increase
+
Zeolites now only generate 1/5 the heat when reacting and don't require a catalyst.
+
+
Ryll/Shaps updated:
+
+
Fixed an issue with player logs becoming confused when someone triggers multiple events within one second (like being attacked by two people at the same time) that would cause holes in the logs
+
+
SandPoot updated:
+
+
You can attack a pile of money on the floor with your id to put it all in quickly.
+
Changes the limb grower a lot.
+
"Limb" costs on limbgrower are actually displayed like it was meant to all along.
+
Swaps the gift static blacklist with a global list one.
+
+
SiliconMain updated:
+
+
Engi department has gas masks in loadout
+
hololocks (which haven't worked for god knows how long) commented out until auxmos is merged
+
+
Sonic121x updated:
+
+
alarm ert hardsuit sprite for naga and canine
+
adjust the naga ert hardsuit to cover the hand
+
cydonia hardsuit helmet
+
digi sprite uniform
+
digi leg suit
+
+
SpaceManiac updated:
+
+
Fixed the maphook
+
+
Thalpy updated:
+
+
fixes some bugs in jacqs code from edits to the codebase
+
+
The Grinch updated:
+
+
infinite presents from hilbert hotel
+
+
TheObserver updated:
+
+
Re-adds the rifle stock, and sets the improv shotgun to be as it was.
+
The maintenance rifle has been shelved - for now. Watch this space.
+
+
TheObserver-sys updated:
+
+
Drake? Where's the dead fairygrass sprite?
+
+
TheSpaghetti updated:
+
+
no more tumor bread double punctuation
+
+
Trilbyspaceclone updated:
+
+
Zeolites now use gold rather then uranium for catalyst
+
Zeolites are not as hard to make ph wise
+
Making Zeolites heats up the beaker less allowing for better control
+
ASP 9mm and M1911 can now have suppressers added
+
Brass welders are 50% faster at refueling
+
redoes self fueling welders in the code to be less speggie
+
the corporate unifoms can now be gotton in the clothing mate vender
+
+
TripleShades updated:
+
+
Firelock to Surgery Bay drapes change: Swapped Nanomed and Fire Alarm button locations in both Surgery Bays change: Removes the double mirror in both Surgery Bays to be a singular mirror change: Moved an intercom to not be doorstuck below Paramedical Office remove: One Surgery Observation Fire Alarm button
+
New Paramedic Office next to Genetics where the old Genetics Reception used to be change: Surgery, Surgery Observation, and Recovery Hall layout revamped drastically change: Maints below Surgery lowered by one tile to recover lost tile space from Surgery expansion
+
+
Tupinambis updated:
+
+
Arachnids (spider people) with limited night vision, flash vulnerability, and webbing.
+
+
Vynzill updated:
+
+
new gateway mission mapadd: jungleresort map
+
fixes high luminosity eyes
+
+
Xantholne updated:
+
+
Fixed new birds changing back to basic parrot when sitting
+
New parrots from the RP server, can be found in Bird Crate in Cargo
+
You can now tuck disky into bed
+
You can now make beds by applying a bed sheet to them
+
You can now tuck in pai cards into bed
+
Added bed tucking element, can be added to any held object to allow tucking into beds
+
Twin Sword Sheaths have an equipment icon and icon when worn now and make a sound when sheathed/unsheathed
+
+
Yakumo Chen updated:
+
+
Slime Jelly is no longer obtainable from slimepeople. Go ask Xenobio
+
+
YakumoChen updated:
+
+
To lower production costs, Buzz Fuzz is now manufactured with Real™️ Synthetic honey.
+
+
Zandario updated:
+
+
Added some framework for future species expansions, including clothing refitting.
+
Made majority of the relevant Species IDs and Categories pre-defined, also for easier expansion and use.
+
lum slime sprites work again
+
Slapped the Species Defines where relevant
+
+
corin9090 updated:
+
+
The chaplain's prayer beads can now be worn on your belt slot
+
+
kappa-sama updated:
+
+
super saiyan
+
ishotgun crafting recipe no longer requires plasteel and is slightly more convenient
+
ishotgun does 45 damage now instead of 40.5
+
s
+
A new spell for the wizard and his martial apprentices, the Inner Mantra technique. It makes you punch people really good and makes you durable, but drains your energy while it's active.
+
A self-buffing spell for valiant bubblegum slayers that is ultimately useless on lavaland and probably overpowered for miner antagonists. Go figure. At least all it does is let you punch hard while draining your health every second.
+
bubblegum now drops a book that makes you into an abusive father instead of a shotgun that plays like pre-nerf shotguns
+
a powerup and powerdown sound effect
+
two icons for two buff spells
+
+
keronshb updated:
+
+
Allows Energy Bola to be caught
+
This also allows them to be dropped/picked up.
+
Adds a reduced stamina buffer for SCarp users
+
Gives SCarp users a better parry
+
Adds the SCarp bundle which includes a bo staff
+
Lets Carp costumes carry Bo Staffs
+
reduces the stamina damage of scarp slightly
+
reduced the blockchance of the bo staff
+
Adds more room to northwest maint
+
Adds a bridge between Atmos and the Turbine.
+
Blob Resource Tower to 2 points per instead of 1 point per.
+
Blob Factory Towers can be placed 5 tiles apart instead of 7.
+
Fixes Blobbernaut Factories consuming Factories if no naut is chosen.
+
Fixes Reflective Blobs
+
Re-adds the Clown Car to the clown uplink
+
15 >16 TC cost
+
bonks on external airlocks
+
Fixes the parry data for scarp
+
+
kittycat2002 updated:
+
+
set the name of /datum/reagent/consumable/ethanol/species_drink to Species Drink
+
+
kiwedespars updated:
+
+
balanced bone gauntlets.
+
the robust dildo weapon now has sound.
+
+
necromanceranne updated:
+
+
Fixes various sprites for bokken, as well as being unable to craft certain parts and duplicate entries.
+
Bokken now come in two lengths; full and wakizashi, and two varieties: wood and ironwood. They have different stats for all four.
+
Bokken require menu crafting and part construction, as well as more complicated materials.
+
Bokken (long and short) require wood, cloth and leather to craft with a hatchet and screwdriver.
+
Ironwood bokken (long and short) require ironcap logs, cloth and leather to craft with a hatchet, screwdriver and welder.
+
Twin sheathes can only fit a pair of blades (longsword + shortsword) or they can fit two shortswords.
+
Fixed a twin sheath runtime.
+
A lot of bokken related sprites received an overhaul. Added overlay sprites for weapons sheathed in the twin sheathes.
+
The extradimensional blade received improved sprites for inhands/back sprites.
+
You can now make all the variants of the bokken.
+
Removes a duplicate sprite.
+
Renames all instances of 'ironwood' to 'steelwood'.
+
Adds new roboticist labcoat sprites!
+
+
qwertyquerty updated:
+
+
Flash the screen on climax
+
+
raspy-on-osu updated:
+
+
salicylic acid
+
space heater heating range and power
+
windoor open length
+
+
shellspeed1 updated:
+
+
Wings from Cit RP have been ported over
+
Moth wings from cit have been ported over
+
Cleaned up some pixels on existing moth wings.
+
Organized the lists for wings by if they are for moths or not and than by alphabetical.
+
Lings now have infinite space for DNA.
+
All xenomorph types have been added as corpses for mapping purposes
+
The dead xenomorphs in the lavaland xenomorph hive now have more variety.
+
Floor bots are now buildable with all toolboxes.
+
Xenomorph hybrids can now select wings ~~add: Xenomorph hybrids can now speak xenomorph~~
+
Xenomorph tongues are available for customization.
+
Mining borgs can claim points again
+
Construction bags have been added, use them to carry all sorts of construction bits.
+
A recipe has been added to cloth stacks to make material and construction bags.
+
Material bags and construction bags are now available in engineering lockers.
+
Adds the disposable sentry gun from tg for 11tc each.
+
The exofab can now print prosthetic limbs
+
The exofab was missing access to multiple cybernetic organs. This has now been rectified.
+
A new recipe for a spicy has been given to us by a strange business man.
+
The bluespace navigation gigabeacon design has been added to shuttle research for those wanting to take their ships around space more.
+
Xenomorph powers now list plasma cost in their description.
silicons updated:
-
shoves have been buffed to apply a status effect rather than a 0.85 movespeed modifier, meaning repeatedly shoving someone now renews the debuff
-
shoves now stagger for 3.5 seconds.
-
war operatives now actually time 20 minutes since roundstart to depart instead of 15.
-
explosive stand bombs can now be examined from any distance
-
explosive stand bombs are now a component.
+
nanite resistances tweaked
+
new nanite programs added for locking the user out from being modified by consoles or antivirals.
+
anomalies no longer spawn in walls
+
Twitch Plays: Clown Car
+
pugilists can now parry
+
c4 can no longer gib mobs
+
medium screens are better now
+
text formatting now uses one character instead of two around the text to emphasize.
+
colormates
+
shoving yourself up now costs 50% more
+
dullahans enabled
+
tailed individuals can now target groin to intertwine tails on grab intent.
+
Clowns now have unpredictable effects on supermatter crystals when dusting from contact.
+
anyone new to the server is lucky enough to have their sprint default to toggle instead of hold
+
stamina crit is only removed when at or under 100 stamina, rather than 140. stamina crit threshold is still at 140.
+
luxury shuttle no longer has noteleport
+
now only poly gets a headset on spawn, not all birds.
+
the warp implant now actually warps you back 10 seconds. leaves a trail, though. now unlimited us.
+
things in DEATHCOMA do not deathgasp on death
+
Meth and changeling adrenals no longer ignore all slowdowns, rather damage slowdowns.
+
you can now be an angel using a magic mirror again
+
command headsets are 120% instead of 160%
+
no more emote italics
+
players can now respawn/return to lobby as a ghost after a 15 minute (default) delay and rejoin on another character with some/many restrictions
+
cryo now preserves everything
+
Magrifle ammo no longer glows.
+
temperature slowdown divisor nerfed to 35 from 20.
+
dna melt drops all items being destroying you
+
keybinds generate anti-collision bindings where necessary automatically now
+
changeling combat mutations rebalanced. most of them take chemicals to upkeep now.
+
set-pose has been added
+
temporary flavor text renamed to set pose, fully visible in examine
+
ninja gloves no longer hardstun
+
ninja gloves now cost half as much to use to compensate
+
simple mobs are now immune to radioactive contamination
+
+
timothyteakettle updated:
+
+
time for memory loss message to show up when being revived is now correctly 300 seconds, instead of 30
+
the load away mission verb won't crash the server now
+
roundstart slimes can turn into puddles now
+
all gas masks (but welding + glass) can be alt clicked to show/hide identity
+
autosurgeons from travelling trader rewards now only have one use
+
fixes held items proccing crossed when passing someone
+
you can now get a family heirlooms based off your species instead of job
+
changeling stings retract upon turning into a slime puddle
+
you cannot transform into a slime puddle with a no drop item in your hands
+
slime puddles are now transparent and their colour looks more natural in comparison to the user
+
slime puddles are now even slower
+
slime puddles now get no protection from worn clothing
+
removes two debug messages left in from my prior eye customization pr
+
adds unlockable loadout items, corresponding category in loadouts, etc
+
added in-game age verification as an alternative to access requests
+
disabling adminhelp noises no longer disables looc
+
apids render now
+
you can now only entwine tails with people who have a tail
+
custom eyes and tongues now properly carry across cloning
+
re-adds the holoform verb for people who want to use it over going through the char list
+
eye sprites should look normal once more
+
licking people washes pie off their face
+
you can now pick your eye sprites from customization
+
looking at loadout equips loadout items on your preview image instead of job items
+
custom holoforms are now accessible through an action instead of through verbs
+
AI holoforms can now emote
+
cloning now correctly copies your blood colour, body sprite type and eye type
+
species with NOTRANSSTING cannot have envy's knife used on them
+
avian/digitigrade legs have been added for slimes
+
you can teleport bread
+
slime puddles are no longer layered down one layer
+
you cannot tackle with two paralysed arms
+
tackling with a single paralysed arm lowers your tackle roll by 2
+
circuits get pin data proc is sanitized when text is returned as data
+
loadout now has save slot support and colour choosing/saving for polychromic items
+
polychromic maid outfit
+
you can rebind communication hotkeys and they're the default now
+
you can now customize your size from 90% to 130%, going below 100% makes you have 10 less max health
+
*squeak
+
anthromorphic synth species
+
improvements to the automatic age gate
+
antag items are now of critical importance and wont fail to be placed on the character
+
a tonne of fixes to colourisation of parts, too many to name, including some sprite fixes
+
things now have their own individual primary/(secondary)/(tertiary) colours as required, and these can be modified by you
+
+
uomo91 updated:
+
+
Fixed "Show All" tab in player panel logs being broken.
+
Whispers, OOC, and various other things display differently in logs, visually distinguishing them from say logs.
+
Player panel logs will now show all logs chronologically, so you'll see commingled say and attack logs if you're on the "Show All" tab, etc...
+
+
yorii updated:
+
+
fixed botany rounding error that caused grass and other plants to misbehave
+
+
zeroisthebiggay updated:
+
+
legion now drops chests
+
Traitor assistants can now purchase the patented POGBox! Put TC into it for even higher damage!
+
MEGAFAUNA DROPS ARE LAVAPROOF
+
cool codex cicatrix inhands
+
gravitokinetic stands from tg
+
buffs stands overall
+
protector stands no longer become tposing invisible apes sometimes
+
jacqueline spawns on boxstation
+
secsheath for your cool stunsword at your local security vendor. you gotta hack it first though.
+
fuck the r*d cr*ss
+
The legion megafauna has been reworked. The fight should now be both slightly harder and faster.
+
You can no longer cheese the colossus by being a sand golem and simply being immune.
diff --git a/html/changelogs/.all_changelog.yml b/html/changelogs/.all_changelog.yml
index 99ffc455c3..4d9876efec 100644
--- a/html/changelogs/.all_changelog.yml
+++ b/html/changelogs/.all_changelog.yml
@@ -26243,7 +26243,7 @@ DO NOT EDIT THIS FILE BY HAND! AUTOMATICALLY GENERATED BY ss13_genchangelog.py.
Ghommie:
- bugfix: You can now actually gain wiring experience from using cable coils.
- bugfix: Opening the View Skill Panel shouldn't trigger messages about insufficient
- admin priviledges anymore.
+ admin privileges anymore.
Yakumo Chen, kappa-sama:
- rscdel: Removes improvised handguns
- rscdel: removed handsaws, improvised gun barrels (you can use atmos pipes again)
@@ -27524,3 +27524,1001 @@ DO NOT EDIT THIS FILE BY HAND! AUTOMATICALLY GENERATED BY ss13_genchangelog.py.
- bugfix: limb id entry in mutant bodyparts now supports switching to/from species
with gendered body parts
- tweak: the minimum brightness of mutant parts is now a define
+2021-01-21:
+ Acer202:
+ - bugfix: Main mining shuttle should no longer look at the public mining shuttle
+ and attempt to dock ontop of it. Monastery shuttle should now function again.
+ Acer202, with minor help from The0bserver:
+ - rscadd: After internal deliberation, CentCom has decided to run a limited reinstatement
+ of public mining shuttles for use in more tried and true station classes. CentCom
+ would like to remind you that this privilege is easily revoked, and that abuse
+ may result in immediate detonation.
+ - rscadd: Restores the mining shuttle on Pubby, Box, Delta, Meta, and Lambda Station.
+ ArcaneMusic, The0bserver-sys:
+ - rscadd: 'New from Hydrowear LLC: The Botanical Belt! This handy yellow belt lets
+ you hold most of your botany gear, and a few beakers for reduced bag and floor
+ clutter!'
+ - tweak: Gives Hydrotrays plumbing pipes automatically, allowing you to make a self
+ sustaining tray via plumbing.
+ - tweak: Gives Service access to Bluespace Beakers, at last, gives Cargo, Science,
+ and Medical the ability to construct reinforced plungers for use on lavaland.
+ ArchieBeepBoop:
+ - rscadd: Upgraded Advanced RTG Machine Preset
+ - bugfix: Outlet Injector Mapping Asset Layer Fix
+ - bugfix: Jacqueen and the Christmas tree should no longer spawn abstract things
+ that can cause shittons of runtimes.
+ Arturlang:
+ - bugfix: You can't tackle in nograv anymore
+ - tweak: You cannot spam drink from blood bags anymore
+ - bugfix: Blood bag drinking inefficiency is now the right way, so you loose some
+ of the blood drinking it straight
+ - bugfix: Handles more edge cases with construct soul returning
+ - tweak: Being sacrificed by the cult no longer removes all hope of rescue.
+ - bugfix: Makes construct mind returning more robust
+ - tweak: Prayers to admins now do a wee ding sound for all prayers, instead of just
+ chaplains
+ - bugfix: Fixes the mint machine's UI
+ - bugfix: Hopefully fixes whitescreen issues for TGUI UI's by giving assets more
+ time to get to the client
+ - bugfix: Fixes hijack implant APC UI, again
+ - code_imp: Comments out spaceman dmm do not sleeps for mob/proc/CommonClickOn,
+ atom/proc/attack_hand, datum/proc/keyLoop and mob/living/proc/Life
+ - bugfix: Bloodsuckers tresspass ability can no longer work while they are not awake.
+ - tweak: The cursed heart now only takes away half as much blood every loop, and
+ can be used as long as you are alive, instead if only you are awake/able to
+ use your hands
+ Bhijn:
+ - tweak: Changeling loudness is now determined as an average of all their abilities,
+ rather than the sum
+ - tweak: To compensate for this, blood tests now require a loudness value of 1 or
+ higher to detect ling blood. Additionally, blood test explosions are now triggered
+ only when the loudness value is higher than 2.
+ BlackMajor:
+ - tweak: Cyborg hypospray no longer injects if it means OD'ing while on help intent.
+ BlueWildrose:
+ - tweak: Nyctophobia quirk now has some light lag compensation.
+ - bugfix: Fixes cloning computer UI not updating when pressing certain buttons -
+ also adds extra check for names to update a message
+ - rscdel: Removes oversized genitalia analysis from medical scanners, since huge
+ dick and titty are no longer a problem anymore thanks to advancements in that
+ kind of technology when it comes to chemical fun times growth.
+ - bugfix: Fixed species-specific drinks not giving a mood boost if you are that
+ species.
+ - tweak: You will now only unbuckle fireman-carried/piggybacked people on disarm
+ or harm intent.
+ - balance: The traitor AI can no longer activate the doomsday device while carded.
+ - bugfix: Fixes noodle size appearance for 12+ inch members.
+ - bugfix: Fixed the subtle hotkey being weird with its input prompts.
+ - rscadd: Adds a subtler anti-ghost hotkey. Default key is 6.
+ - tweak: No more straining when your cock or breasts are growing via incubus draft
+ or succubus milk.
+ - rscadd: PubbyStation now has two Christmas Tree spawners.
+ - tweak: You can now have a max-roundstart-dicksize-config inch long johnson before
+ you start suffering blood loss and slowdowns instead of a 20 inch one.
+ - rscadd: Color Mates have been added to all stations (except Snaxi). Enjoy coloring
+ your attire without having to bug science!
+ - bugfix: Polychromic hoodies that were obtained from the loadout have functional
+ colorable hoods now.
+ - rscadd: Adds in timid woman/man costumes. Available at your autodrobe! Also adds
+ in garters as some new socks.
+ - spellcheck: Corrected the capitalization in gasmask concealment examine text
+ Chiirno:
+ - rscadd: Added the paramedics EVA suit as a purchase from the cargo console.
+ - rscadd: Paramedics office and Surgery Storage Room
+ - tweak: Remodeled the surgery room, as well as shrunk Morgue and Starboard Emergency
+ Storage. Fiddled with some areas for better map edit clarity and fixed one runtime
+ in Vacant Office A.
+ - imageadd: Added the paramedic closet sprite, a paramedic colored medical3 closet.
+ - code_imp: Added a paramedic closet, which is the standard medical3 closet with
+ their suit, a pinpointer, and a crew monitor added.
+ - tweak: Nightmare now deals additional damage to most light sources.
+ - bugfix: Nightmare now one-shots miners beacons and glowshrooms
+ - bugfix: Portable Chem Mixer now researchable from biotech node.
+ - tweak: Chem masters can now dispense 20 instances of its outputs instead of 10.
+ Delams-The-SM:
+ - rscadd: Added 3 new emotes *hiss *purr *meow
+ - soundadd: ported sounds from Citadel RP for *purr and *meow
+ - bugfix: fixed randomization of colors for things like mulligan and Stabilized
+ green slime extract for matrixed body parts
+ DeltaFire15:
+ - balance: Biomechanical (hybrid) bodyparts now have access to wound-fixing surgeries.
+ - tweak: A wound being fixed no longer just qdel()s surgeries connected to it.
+ - tweak: Some robotic surgery steps are now a bit more clear.
+ - bugfix: Organs no longer get fed to people after successfully being inserted into
+ them.
+ - tweak: Not completing the do_after of a surgery no longer causes you to attack
+ the target with whatever you were holding.
+ - rscadd: IPC cells & power cords are now printable after they are researched.
+ - rscadd: A new surgery, allowing revival of synths without a defib at hand.
+ - balance: 'Semi-permanent damage of Synth limbs caused by passing the damage threshold:
+ 10 <- 15.'
+ - tweak: The embed removal surgery now has a version for Synths.
+ - balance: EMPs no longer hardstun Synths.
+ - bugfix: Portals no longer runtime because of incorrect args.
+ - tweak: Abductors now can use experimental organ replacement surgery on robots
+ / synthetics.
+ - bugfix: Fixes a minor incorrectness in ratvarian borg slabs (ratvar_act -> ui_act)
+ - bugfix: Changelings no longer double-deathgasp when activating the regen stasis
+ ability while not dead.
+ - bugfix: People installing KA modkits in miner borgs is no longer broken.
+ - bugfix: Fixes the tail entwine messages displaying incorrectly.
+ - bugfix: Antagging / Deantagging Heretics now properly sets their special role.
+ - bugfix: The borg VTEC ability now actually gets removed when the upgrade is removed.
+ - bugfix: Supplypods shouldn't cause runtimes anymore, and shrapnel (pelletclouds)
+ should work for them.
+ - rscadd: Robots (anyone with the robotic_organism trait) have toxins damage replaced
+ with system corruption. See the PR for details.
+ - code_imp: Clockwork rites now support hiding specific rites from neutered servants.
+ - tweak: AIs now only have to kill people once instead of permanently.
+ - bugfix: Scripture no longer sometimes eats part of its invocation.
+ - balance: APCs and silicons are now more susceptible to powerdrains (by the power_drain()
+ proc, which is rare)
+ - balance: Void Volt has been modified from a chant to a singular pulse.
+ - balance: Robotpeople are now fully immune to the effects of alcohol (drunkness
+ etc.)
+ - tweak: Renames the alcohol intolerance trait in the code to make what it does
+ more clear.
+ - bugfix: Self-fueling weldingtools recharge fuel properly again.
+ - bugfix: Brass welders now actually recharge faster than experimental ones.
+ - bugfix: Repeatable surgery steps can no longer cause an infinite loop if not completing
+ the do_after
+ - bugfix: The Revenant self-revive ability is no longer broken.
+ - bugfix: Loot items mobs drop are no longer always failing to initialize.
+ - tweak: Instant summons can no longer do wacky stuff with disposals (and nukes).
+ - bugfix: Objectives are no longer very broken.
+ - bugfix: Bloodcult stunhands now work against clockies like they were supposed
+ to instead of hardstunning.
+ - balance: zeolites are now actual fermichems instead of being incredibly easy to
+ make.
+ - bugfix: Using syringes / droppers on chem heaters with beakers in them works again.
+ - bugfix: Some edge cases causing issues with system corruption shouldn't be able
+ to occur anymore.
+ - bugfix: Cyborg B.o.r.i.s. installation now checks for if the chest has a cell,
+ just like how it does with MMIs.
+ - bugfix: The 'Your body is in a cloner' notification works again
+ - bugfix: Hijack implants should work properly again (or, at least better)
+ - bugfix: Liches are now good skeletons again instead of weak ones
+ - bugfix: The piratepad control cannot be destroyed again.
+ - bugfix: Pirates have received new supplies of jetpacks instead of useless oxygen
+ tanks
+ - bugfix: Ratvarian AIs are once again able to show their linked borgs Ratvar's
+ light
+ - bugfix: Hijackers are once again unable to detonate borgs without being adjacent
+ to the console
+ - bugfix: Automated annoucement systems and gulag ore consoles no longer waste emag
+ charges
+ - bugfix: Automated announcement systems once again can be remote controlled by
+ non-AIs with silicon access
+ - bugfix: APCs being hijacked multiple times at once is no longer possible, preventing
+ some issues
+ - bugfix: Recharging APCs no longer use 0.2% of the power they should be using.
+ - bugfix: APCs no longer always use as much power as they can for their cell, even
+ if it is full.
+ - bugfix: Vampire shapeshifting should now behave as intended
+ - balance: Some synth damage stuff has been a bit rebalanced, see the PR for details.
+ - rscadd: Nanogel, available at medical and robotics, which fixes internal damage
+ in sufficiently repaired robotic limbs.
+ - balance: Robotic Limbs now each have their own damage threshhold values
+ - balance: Robotic Limb damage threshholds are now seperated into threshhold itself
+ and mindamage when passed balance; Hybrid limbs can now be injected with hypos,
+ but not sprayed (Still not healed by chems)
+ - tweak: Brain surgery has been tweaked back to allowing robotic limbs, blacklisting
+ IPC brains instead.
+ - tweak: Robot brain surgery can now be used on organic heads, if there is a IPC
+ brain in them somehow.
+ - tweak: The robot limb heal surgery can now be used even if the target's torso
+ is not robotic, as long as they have robotic limbs
+ - refactor: BODYPART_ROBOTIC / BODYPART_ORGANIC checks replaced with helper-procs
+ whereever possible.
+ - code_imp: Added a BODYPART_HYBRID define for robotic bodyparts that behave organic
+ in some regards.
+ - bugfix: The transmission sigil power drain works now
+ - bugfix: A certain lizard (totally not me) being stupid is no longer going to break
+ regenerate_bodyparts
+ - bugfix: Combat mode now will not stay permanently disabled due to status effects
+ not working as intended.
+ - bugfix: Attacking some certain objects no longer has no clickdelay.
+ - bugfix: the blacksmithing skill now works properly
+ - tweak: Anvils cannot be interacted with with hammers whilst they are already being
+ used
+ - tweak: If someone has no gloves when interacting with heated ingots, they no longer
+ ignore their effects.
+ - bugfix: A runtime caused by hallucinations is gone.
+ - bugfix: Cargo packs marked as 'no private buying' now actually register as such.
+ - balance: Fleshmend, Anatomic Panacea and bloodsucker healing now work for Synths
+ / IPCs.
+ - tweak: Medibots now ignore people they cannot help due to their biology.
+ - bugfix: get_damaged_bodyparts() is no longer broken.
+ - bugfix: Your target cryoing will no longer give you a free greentext.
+ - bugfix: Sleeper UI interactiveness now behaves correctly.
+ Detective-Google:
+ - rscadd: arcade carpet
+ - rscadd: explosions now get broadcasted to deadchat.
+ - rscadd: Lick radial
+ - bugfix: Hilbert's jukebox works
+ - bugfix: arcade carpets now actually work
+ - tweak: the snow taxi is no longer the slow taxi
+ ERP mains:
+ - rscadd: Subtler Around Table is now a verb
+ EdgeLordExe, MoonFalcon:
+ - balance: Ported a bunch of heretic-related tweaks and changes from tg
+ EmeraldSundisk:
+ - rscadd: Adds a few new area designations primarily for CogStation, incorporates
+ them into said map
+ - tweak: Reorganizes some area designations for ease of use, along with renaming
+ the central "Router" to "Routing Depot"
+ - bugfix: Fixes an incorrectly designated area in CogStation
+ - bugfix: Changes the area designations to be not varedited since the code didn't
+ like that anymore
+ - bugfix: The cargo bay conveyor belts not only work with the shuttle now but go
+ in the right direction to boot
+ - tweak: Slight visual adjustments to cargo in light of this
+ - rscadd: The arcade's got RAD carpet now
+ - bugfix: Fixes the conveyor belt issues in Delta Station's cargo wing
+ - rscdel: Removes some of the dirt around the affected area (presumably they would
+ have cleaned it up while working on it)
+ - rscadd: Adds a floor light to fix the "dark spot" cargo had
+ - rscadd: Adds a new "Computer Core" area designation for CogStation
+ - bugfix: Fixes some missing area strings
+ - tweak: Replaces some firelocks with directional ones as to ensure desks/counters
+ can still be accessed
+ - balance: The "Skelter ruin" now has stechkins as opposed to M1911s
+ - tweak: Skelter's decorative bullet casings replaced to factor in the change in
+ caliber
+ - rscadd: Skelter now has a combat knife and fluff note
+ Ghommie:
+ - bugfix: You can access the mime / clown mask skins radial menu once again.
+ - bugfix: Dice bags no longer act like cardboard boxes.
+ - bugfix: Abductors should be no longer mute.
+ - bugfix: Item action buttons should now properly show the item current overlays,
+ most times.
+ - bugfix: The blackbox should now go into your hand slot when pried out, rather
+ than tumbling on the ground everytime.
+ - tweak: The Quick Equip hotkey is now usable by all living mobs (so long they have
+ hands and equipment slots)
+ Ghommie, porting PRs by MMMiracles and pireamaineach, credits to BlueWildrose too.:
+ - rscadd: You can now draw on plasmaman helmets with a crayon to turn their frown
+ upside-down.
+ - balance: Plasmaman helmets no longer hide your identity when worn by themselves.
+ - balance: Plasmaman helmets now have welding visors, which can't stack with their
+ torches in the helmet and are visible.
+ Hatterhat:
+ - rscadd: Energy sabre reskin for the energy sword - access via alt-click.
+ - bugfix: Alt-click reskins are fixed.
+ - tweak: Defibrillators and their many, many overlays were moved to another .dmi.
+ - tweak: You can now change the color of an energy sword via multitool. Not deswords.
+ Yet.
+ - imageadd: The Syndicate appear to be issuing new revolver variants.
+ - rscadd: Basic sticky technology is now a roundstart tech. Advanced sticky technology
+ is BEPIS-locked, though. Theoretically.
+ - tweak: Non-smithed katanas (including the temporal katana) can now fit in the
+ twin sheath.
+ - tweak: Cotton and durathread processing by hand now acts like grass. Stand on
+ a pile of cotton (or durathread) and use a single bundle from it.
+ - spellcheck: Utility uniforms now comply with the "nonproper equipment names" thing.
+ - bugfix: The CapDrobe now allows the captain to get his own clothes for free. Probably.
+ - tweak: All captains' clothes now offer 15 woundarmor, up from the 5. Because apparently
+ only the suit and tie and its suitskirt subtype have this wound armor, which
+ is dumb.
+ - rscadd: The nature interaction shuttle with the monkeys now has tiny fans on the
+ airlocks in, because that's apparently a feature that was missing.
+ - rscadd: More bags have been added to department vendors.
+ - balance: Every roundstart species (and also ash walkers) now has flesh and bone
+ that can be wounded.
+ - balance: Recipes for sutures, regen mesh, and sterilized gauze have been adjusted
+ to be easier, mostly.
+ - balance: Sterilized gauze is better at absorbing blood and being a splint.
+ - bugfix: Energy sabres now have an off inhand.
+ - balance: The bone gauntlets should be slightly less murderously punchy on the
+ fast punches mode.
+ - tweak: RPEDs now drop their lowest part tier first when quick-emptied (used inhand).
+ - tweak: Improvised gauzes can now be crafted in stacks up to 10, like their maximum
+ stacksize implies they should be capable of doing.
+ - bugfix: Pouring sterilizine on gauze now takes the proper 5u per sterilized gauze
+ instead of 10u.
+ - bugfix: Cryogenics now screams on common again when your fuckbuddy heads out.
+ - rscadd: Survival daggers! A slightly more expensive survival knife that comes
+ with a brighter flashlight. On the blade.
+ - tweak: Luxury pod capsules look different from normal capsules.
+ - rscadd: The wastes of Lavaland and the icy caverns of Snow Taxi rumble in unison.
+ - tweak: Exosuits sold on the Supply shuttle no longer leave wreckages.
+ - rscdel: Apparently, shrink rays were buyable again, despite a PR having been made
+ a while ago specifically for removing shrink rays. They're gone again.
+ - rscadd: Changeling bone gauntlets! They punch the shit out of people really good.
+ - tweak: Guerilla gloves and gorilla gloves inherit the strip modifiers of their
+ predecessors, because apparently they had those.
+ - balance: Pugilists now always hit the targeted limb and never miss.
+ - rscadd: The dock-silver standard set by Box and Meta has been enforced across
+ maps in rotation (Delta, Pubby, Lambda).
+ - bugfix: The Box whiteship now has its missing tiny fan back.
+ - bugfix: The survival dagger light on the sprite now actually turns on and off.
+ - balance: The survival dagger in the glaive kit that can also be bought by itself
+ is now better at butchering things.
+ HeroWithYay:
+ - bugfix: Changed description of Necrotizing Fasciitis symptom.
+ - tweak: Wormhole Projector and Gravity Gun now require anomaly cores to function
+ instead of firing pins.
+ KeRSedChaplain:
+ - imageadd: Resprited the brass claw
+ LetterN:
+ - rscadd: 2 more ways to get up from z1
+ - tweak: tweaked the z2 garden to be less blank
+ - bugfix: fixed telecomms pda log
+ - rscadd: Coin & Holochip support for slot machine
+ - admin: Stickybans are now saved in the DB too
+ - soundadd: Immersive ™ audio reverbs. (also adds multiz audio)
+ - code_imp: Semi-hardsync from TG
+ - code_imp: Updates rust-g
+ - code_imp: Uses git CI instead of travis/appveyor now
+ - code_imp: Updates git and build tests.
+ - bugfix: minimap text
+ - code_imp: ports cinematic upgrades
+ Linzolle:
+ - bugfix: entertainment monitors no longer invisible
+ - rscadd: entertainment monitors now light up and display text when motion is detected
+ in thunderdome
+ - bugfix: lizard snouts are no longer *slightly* lighter than they are supposed
+ to be.
+ MrJWhit:
+ - rscadd: Expanded space hermit base
+ - tweak: Replaced engineering fuel tank with a large fuel tank
+ - tweak: Changed access to sec suit storage from armory access in every map to other
+ security access
+ - rscadd: Adds a space loop to every map in toxins
+ - rscadd: ''
+ - tweak: Added the ability for cargo to buy a large welding tank
+ - imageadd: Tweaked large tank reagent sprites to /tg/'s
+ - tweak: Gives metastation toxins storage a scrubber and a vent
+ - tweak: Updates suit storage info on Tip Of the Round.
+ - tweak: Increased christmas event from 22th to 27th to 10th to 27th
+ - tweak: Removes an opposum from the wall
+ - tweak: Donut boxes show what's inside of them now
+ - tweak: Updated meat icons
+ - admin: Canceling events gives more time to stop from 10 to 30
+ - tweak: Fixes two chairs on one table
+ - tweak: Removed the wires connecting the AI from the rest of the station on cogstation.
+ - tweak: Fixes experimenter on cogstation.
+ - tweak: Less pipes in the overall area in toxins on cogstation
+ - tweak: Small fixes on security on boxstation
+ - tweak: Updated jukebox sprite.
+ - tweak: Fixes maint area in boxstation
+ - tweak: Christmas starts on the 18th now
+ - rscadd: Adds a goose bar sign
+ - bugfix: Effects can no longer trigger landmines
+ - rscdel: Removes the screen flashing on climax.
+ - rscadd: Makes gas sensors fireproof.
+ - tweak: A small bucket of random fixes,
+ - tweak: Minor fixes to kilo
+ - tweak: Porting garbage collection tweak from /tg/
+ - tweak: Updates our dark gygax sprites to /tg/'s
+ - tweak: Bugfix of a morph becoming an AI eye
+ - tweak: Mining station oxygen locker on the cycling airlock starts out wrenched.
+ - balance: Nerf combat knife damage
+ - bugfix: Code improvement on ventcrawling
+ NT Cleaning Crews On Break:
+ - rscadd: Most kinds of dirt, grime, and debris are now persistent. Get to work,
+ jannies.
+ - rscadd: Dirt can now be removed by tile replacements. Other cleanable decals can't,
+ though.
+ Putnam3145:
+ - tweak: Replaces majority judgement with usual judgement.
+ - bugfix: Toilet loot spawners don't lag the server on server start with forced
+ hard dels.
+ - bugfix: vore prefs save now
+ - tweak: gear harness no longer magically covers up the body mechanically despite
+ covering up nothing visually
+ - balance: Regen coma now puts into a coma even from crit or while unconscious.
+ - bugfix: Regen coma now properly weakens while asleep.
+ - bugfix: Multi-surgery unit test no longer fails at random.
+ - refactor: Dwarf speech is no longer absolutely paranoid about word replacement.
+ - balance: Spontaneous brain trauma now requires minimum 5 players
+ - tweak: Grab bag works as advertised.
+ - balance: Xeno threat in dynamic tripled.
+ - code_imp: 'Vote system #defines are now strings'
+ - rscadd: Stat panel UI for ranked choice votes
+ - rscadd: A fallback for dynamic antag rolling that allows for it to just try between
+ traitor, blood brothers, heretics, changeling, bloodsucker and devil until there
+ are enough roundstart antags. This can also happen randomly anyway. Blood brothers
+ and devil are disabled for now, but the code is there to enable them.
+ - rscadd: A new storyteller, "Grab Bag", that forces the above round type.
+ - bugfix: atmos subsystem no longer dies if there's too many gases
+ - bugfix: Emotes can properly be filtered for in TGUI.
+ - bugfix: Holofirelocks work now.
+ - bugfix: adminhelping no longer removes entire admin tab
+ - bugfix: end of round no longer removes entire admin tab
+ - bugfix: Fixed a runtime in every healing nanite program.
+ - bugfix: removed a unit test causing master to fail
+ - tweak: Planetary atmos no longer does superconduction.
+ - bugfix: Dynamic vote no longer shows the none-storyteller.
+ - tweak: You can now exit polycircuit input
+ - bugfix: Polycircuits now check for range
+ - bugfix: gear harness alt-click is now sane
+ - code_imp: rolldown() and toggle_jumpsuit_adjust() now no longer mix behavior-that-should-be-overridden
+ and behavior-that-shouldn't-be-overridden in ways that make no sense.
+ - tweak: Gear harness now covers nothing.
+ - bugfix: Chemical stuff now displays fermichem stuff properly
+ - balance: Rad collectors now get 1.25x as much energy from radiation
+ - balance: Rad collectors now put out 1.25x as much stored energy per tick
+ - balance: Above two rad collector changes give a total 56.25% power output increase
+ - balance: Zeolites now only generate 1/5 the heat when reacting and don't require
+ a catalyst.
+ Ryll/Shaps:
+ - admin: Fixed an issue with player logs becoming confused when someone triggers
+ multiple events within one second (like being attacked by two people at the
+ same time) that would cause holes in the logs
+ SandPoot:
+ - tweak: You can attack a pile of money on the floor with your id to put it all
+ in quickly.
+ - refactor: Changes the limb grower a lot.
+ - bugfix: '"Limb" costs on limbgrower are actually displayed like it was meant to
+ all along.'
+ - code_imp: Swaps the gift static blacklist with a global list one.
+ SiliconMain:
+ - tweak: Engi department has gas masks in loadout
+ - tweak: hololocks (which haven't worked for god knows how long) commented out until
+ auxmos is merged
+ Sonic121x:
+ - rscadd: alarm ert hardsuit sprite for naga and canine
+ - tweak: adjust the naga ert hardsuit to cover the hand
+ - bugfix: cydonia hardsuit helmet
+ - rscadd: digi sprite uniform
+ - bugfix: digi leg suit
+ SpaceManiac:
+ - bugfix: Fixed the maphook
+ Thalpy:
+ - bugfix: fixes some bugs in jacqs code from edits to the codebase
+ The Grinch:
+ - rscdel: infinite presents from hilbert hotel
+ TheObserver:
+ - rscadd: Re-adds the rifle stock, and sets the improv shotgun to be as it was.
+ - rscdel: The maintenance rifle has been shelved - for now. Watch this space.
+ TheObserver-sys:
+ - bugfix: Drake? Where's the dead fairygrass sprite?
+ TheSpaghetti:
+ - bugfix: no more tumor bread double punctuation
+ Trilbyspaceclone:
+ - tweak: Zeolites now use gold rather then uranium for catalyst
+ - tweak: Zeolites are not as hard to make ph wise
+ - tweak: Making Zeolites heats up the beaker less allowing for better control
+ - tweak: ASP 9mm and M1911 can now have suppressers added
+ - balance: Brass welders are 50% faster at refueling
+ - code_imp: redoes self fueling welders in the code to be less speggie
+ - rscadd: the corporate unifoms can now be gotton in the clothing mate vender
+ TripleShades:
+ - rscadd: 'Firelock to Surgery Bay drapes change: Swapped Nanomed and Fire Alarm
+ button locations in both Surgery Bays change: Removes the double mirror in both
+ Surgery Bays to be a singular mirror change: Moved an intercom to not be doorstuck
+ below Paramedical Office remove: One Surgery Observation Fire Alarm button'
+ - rscadd: 'New Paramedic Office next to Genetics where the old Genetics Reception
+ used to be change: Surgery, Surgery Observation, and Recovery Hall layout revamped
+ drastically change: Maints below Surgery lowered by one tile to recover lost
+ tile space from Surgery expansion'
+ Tupinambis:
+ - rscadd: Arachnids (spider people) with limited night vision, flash vulnerability,
+ and webbing.
+ Vynzill:
+ - rscadd: 'new gateway mission mapadd: jungleresort map'
+ - bugfix: fixes high luminosity eyes
+ Xantholne:
+ - bugfix: Fixed new birds changing back to basic parrot when sitting
+ - rscadd: New parrots from the RP server, can be found in Bird Crate in Cargo
+ - rscadd: You can now tuck disky into bed
+ - rscadd: You can now make beds by applying a bed sheet to them
+ - rscadd: You can now tuck in pai cards into bed
+ - rscadd: Added bed tucking element, can be added to any held object to allow tucking
+ into beds
+ - bugfix: Twin Sword Sheaths have an equipment icon and icon when worn now and make
+ a sound when sheathed/unsheathed
+ Yakumo Chen:
+ - balance: Slime Jelly is no longer obtainable from slimepeople. Go ask Xenobio
+ YakumoChen:
+ - balance: "To lower production costs, Buzz Fuzz is now manufactured with Real\u2122\
+ \uFE0F Synthetic honey."
+ Zandario:
+ - code_imp: Added some framework for future species expansions, including clothing
+ refitting.
+ - refactor: Made majority of the relevant Species IDs and Categories pre-defined,
+ also for easier expansion and use.
+ - bugfix: lum slime sprites work again
+ - code_imp: Slapped the Species Defines where relevant
+ corin9090:
+ - tweak: The chaplain's prayer beads can now be worn on your belt slot
+ kappa-sama:
+ - bugfix: super saiyan
+ - tweak: ishotgun crafting recipe no longer requires plasteel and is slightly more
+ convenient
+ - balance: ishotgun does 45 damage now instead of 40.5
+ - rscadd: s
+ - tweak: s
+ - balance: s
+ - bugfix: s
+ - rscadd: A new spell for the wizard and his martial apprentices, the Inner Mantra
+ technique. It makes you punch people really good and makes you durable, but
+ drains your energy while it's active.
+ - rscadd: A self-buffing spell for valiant bubblegum slayers that is ultimately
+ useless on lavaland and probably overpowered for miner antagonists. Go figure.
+ At least all it does is let you punch hard while draining your health every
+ second.
+ - balance: bubblegum now drops a book that makes you into an abusive father instead
+ of a shotgun that plays like pre-nerf shotguns
+ - soundadd: a powerup and powerdown sound effect
+ - imageadd: two icons for two buff spells
+ keronshb:
+ - bugfix: Allows Energy Bola to be caught
+ - balance: This also allows them to be dropped/picked up.
+ - rscadd: Adds a reduced stamina buffer for SCarp users
+ - rscadd: Gives SCarp users a better parry
+ - rscadd: Adds the SCarp bundle which includes a bo staff
+ - rscadd: Lets Carp costumes carry Bo Staffs
+ - balance: reduces the stamina damage of scarp slightly
+ - balance: reduced the blockchance of the bo staff
+ - rscadd: Adds more room to northwest maint
+ - rscadd: Adds a bridge between Atmos and the Turbine.
+ - balance: Blob Resource Tower to 2 points per instead of 1 point per.
+ - balance: Blob Factory Towers can be placed 5 tiles apart instead of 7.
+ - bugfix: Fixes Blobbernaut Factories consuming Factories if no naut is chosen.
+ - bugfix: Fixes Reflective Blobs
+ - rscadd: Re-adds the Clown Car to the clown uplink
+ - balance: 15 >16 TC cost
+ - balance: bonks on external airlocks
+ - bugfix: Fixes the parry data for scarp
+ kittycat2002:
+ - rscadd: set the name of /datum/reagent/consumable/ethanol/species_drink to Species
+ Drink
+ kiwedespars:
+ - balance: balanced bone gauntlets.
+ - rscadd: the robust dildo weapon now has sound.
+ necromanceranne:
+ - bugfix: Fixes various sprites for bokken, as well as being unable to craft certain
+ parts and duplicate entries.
+ - rscadd: 'Bokken now come in two lengths; full and wakizashi, and two varieties:
+ wood and ironwood. They have different stats for all four.'
+ - rscadd: Bokken require menu crafting and part construction, as well as more complicated
+ materials.
+ - tweak: Bokken (long and short) require wood, cloth and leather to craft with a
+ hatchet and screwdriver.
+ - tweak: Ironwood bokken (long and short) require ironcap logs, cloth and leather
+ to craft with a hatchet, screwdriver and welder.
+ - balance: Twin sheathes can only fit a pair of blades (longsword + shortsword)
+ or they can fit two shortswords.
+ - bugfix: Fixed a twin sheath runtime.
+ - imageadd: A lot of bokken related sprites received an overhaul. Added overlay
+ sprites for weapons sheathed in the twin sheathes.
+ - imageadd: The extradimensional blade received improved sprites for inhands/back
+ sprites.
+ - bugfix: You can now make all the variants of the bokken.
+ - bugfix: Removes a duplicate sprite.
+ - tweak: Renames all instances of 'ironwood' to 'steelwood'.
+ - rscadd: Adds new roboticist labcoat sprites!
+ qwertyquerty:
+ - bugfix: Flash the screen on climax
+ raspy-on-osu:
+ - spellcheck: salicylic acid
+ - tweak: space heater heating range and power
+ - tweak: windoor open length
+ shellspeed1:
+ - rscadd: Wings from Cit RP have been ported over
+ - rscadd: Moth wings from cit have been ported over
+ - bugfix: Cleaned up some pixels on existing moth wings.
+ - tweak: Organized the lists for wings by if they are for moths or not and than
+ by alphabetical.
+ - balance: Lings now have infinite space for DNA.
+ - rscadd: All xenomorph types have been added as corpses for mapping purposes
+ - balance: The dead xenomorphs in the lavaland xenomorph hive now have more variety.
+ - tweak: Floor bots are now buildable with all toolboxes.
+ - rscadd: 'Xenomorph hybrids can now select wings ~~add: Xenomorph hybrids can now
+ speak xenomorph~~'
+ - rscadd: Xenomorph tongues are available for customization.
+ - rscadd: Mining borgs can claim points again
+ - rscadd: Construction bags have been added, use them to carry all sorts of construction
+ bits.
+ - rscadd: A recipe has been added to cloth stacks to make material and construction
+ bags.
+ - balance: Material bags and construction bags are now available in engineering
+ lockers.
+ - rscadd: Adds the disposable sentry gun from tg for 11tc each.
+ - rscadd: The exofab can now print prosthetic limbs
+ - bugfix: The exofab was missing access to multiple cybernetic organs. This has
+ now been rectified.
+ - rscadd: A new recipe for a spicy has been given to us by a strange business man.
+ - rscadd: The bluespace navigation gigabeacon design has been added to shuttle research
+ for those wanting to take their ships around space more.
+ - tweak: Xenomorph powers now list plasma cost in their description.
+ silicons:
+ - tweak: nanite resistances tweaked
+ - rscadd: new nanite programs added for locking the user out from being modified
+ by consoles or antivirals.
+ - rscdel: anomalies no longer spawn in walls
+ - rscadd: 'Twitch Plays: Clown Car'
+ - rscadd: pugilists can now parry
+ - balance: c4 can no longer gib mobs
+ - tweak: medium screens are better now
+ - tweak: text formatting now uses one character instead of two around the text to
+ emphasize.
+ - rscadd: colormates
+ - balance: shoving yourself up now costs 50% more
+ - bugfix: dullahans enabled
+ - rscadd: tailed individuals can now target groin to intertwine tails on grab intent.
+ - rscadd: Clowns now have unpredictable effects on supermatter crystals when dusting
+ from contact.
+ - tweak: anyone new to the server is lucky enough to have their sprint default to
+ toggle instead of hold
+ - balance: stamina crit is only removed when at or under 100 stamina, rather than
+ 140. stamina crit threshold is still at 140.
+ - tweak: luxury shuttle no longer has noteleport
+ - rscdel: now only poly gets a headset on spawn, not all birds.
+ - tweak: the warp implant now actually warps you back 10 seconds. leaves a trail,
+ though. now unlimited us.
+ - bugfix: things in DEATHCOMA do not deathgasp on death
+ - tweak: Meth and changeling adrenals no longer ignore all slowdowns, rather damage
+ slowdowns.
+ - rscadd: you can now be an angel using a magic mirror again
+ - tweak: command headsets are 120% instead of 160%
+ - bugfix: no more emote italics
+ - rscadd: players can now respawn/return to lobby as a ghost after a 15 minute (default)
+ delay and rejoin on another character with some/many restrictions
+ - rscadd: cryo now preserves everything
+ - bugfix: Magrifle ammo no longer glows.
+ - tweak: temperature slowdown divisor nerfed to 35 from 20.
+ - balance: dna melt drops all items being destroying you
+ - bugfix: keybinds generate anti-collision bindings where necessary automatically
+ now
+ - balance: changeling combat mutations rebalanced. most of them take chemicals to
+ upkeep now.
+ - rscadd: set-pose has been added
+ - tweak: temporary flavor text renamed to set pose, fully visible in examine
+ - bugfix: ninja gloves no longer hardstun
+ - balance: ninja gloves now cost half as much to use to compensate
+ - bugfix: simple mobs are now immune to radioactive contamination
+ timothyteakettle:
+ - bugfix: time for memory loss message to show up when being revived is now correctly
+ 300 seconds, instead of 30
+ - bugfix: the load away mission verb won't crash the server now
+ - rscadd: roundstart slimes can turn into puddles now
+ - rscadd: all gas masks (but welding + glass) can be alt clicked to show/hide identity
+ - tweak: autosurgeons from travelling trader rewards now only have one use
+ - bugfix: fixes held items proccing crossed when passing someone
+ - tweak: you can now get a family heirlooms based off your species instead of job
+ - tweak: changeling stings retract upon turning into a slime puddle
+ - tweak: you cannot transform into a slime puddle with a no drop item in your hands
+ - tweak: slime puddles are now transparent and their colour looks more natural in
+ comparison to the user
+ - tweak: slime puddles are now even slower
+ - tweak: slime puddles now get no protection from worn clothing
+ - rscdel: removes two debug messages left in from my prior eye customization pr
+ - rscadd: adds unlockable loadout items, corresponding category in loadouts, etc
+ - rscadd: added in-game age verification as an alternative to access requests
+ - bugfix: disabling adminhelp noises no longer disables looc
+ - bugfix: apids render now
+ - bugfix: you can now only entwine tails with people who have a tail
+ - bugfix: custom eyes and tongues now properly carry across cloning
+ - rscadd: re-adds the holoform verb for people who want to use it over going through
+ the char list
+ - bugfix: eye sprites should look normal once more
+ - rscadd: licking people washes pie off their face
+ - rscadd: you can now pick your eye sprites from customization
+ - tweak: looking at loadout equips loadout items on your preview image instead of
+ job items
+ - tweak: custom holoforms are now accessible through an action instead of through
+ verbs
+ - tweak: AI holoforms can now emote
+ - tweak: cloning now correctly copies your blood colour, body sprite type and eye
+ type
+ - bugfix: species with NOTRANSSTING cannot have envy's knife used on them
+ - rscadd: avian/digitigrade legs have been added for slimes
+ - rscadd: you can teleport bread
+ - tweak: slime puddles are no longer layered down one layer
+ - tweak: you cannot tackle with two paralysed arms
+ - tweak: tackling with a single paralysed arm lowers your tackle roll by 2
+ - bugfix: circuits get pin data proc is sanitized when text is returned as data
+ - rscadd: loadout now has save slot support and colour choosing/saving for polychromic
+ items
+ - rscadd: polychromic maid outfit
+ - rscadd: you can rebind communication hotkeys and they're the default now
+ - rscadd: you can now customize your size from 90% to 130%, going below 100% makes
+ you have 10 less max health
+ - rscadd: '*squeak'
+ - rscadd: anthromorphic synth species
+ - rscadd: improvements to the automatic age gate
+ - tweak: antag items are now of critical importance and wont fail to be placed on
+ the character
+ - bugfix: a tonne of fixes to colourisation of parts, too many to name, including
+ some sprite fixes
+ - rscadd: things now have their own individual primary/(secondary)/(tertiary) colours
+ as required, and these can be modified by you
+ uomo91:
+ - bugfix: Fixed "Show All" tab in player panel logs being broken.
+ - bugfix: Whispers, OOC, and various other things display differently in logs, visually
+ distinguishing them from say logs.
+ - refactor: Player panel logs will now show all logs chronologically, so you'll
+ see commingled say and attack logs if you're on the "Show All" tab, etc...
+ yorii:
+ - bugfix: fixed botany rounding error that caused grass and other plants to misbehave
+ zeroisthebiggay:
+ - bugfix: legion now drops chests
+ - rscadd: Traitor assistants can now purchase the patented POGBox! Put TC into it
+ for even higher damage!
+ - balance: MEGAFAUNA DROPS ARE LAVAPROOF
+ - imageadd: cool codex cicatrix inhands
+ - rscadd: gravitokinetic stands from tg
+ - balance: buffs stands overall
+ - bugfix: protector stands no longer become tposing invisible apes sometimes
+ - bugfix: jacqueline spawns on boxstation
+ - rscadd: secsheath for your cool stunsword at your local security vendor. you gotta
+ hack it first though.
+ - imageadd: fuck the r*d cr*ss
+ - rscadd: The legion megafauna has been reworked. The fight should now be both slightly
+ harder and faster.
+ - balance: You can no longer cheese the colossus by being a sand golem and simply
+ being immune.
+2021-01-22:
+ Arturlang:
+ - rscadd: Adds a way to give items to people, you can combat mode rightclick to
+ offer it to one person, right click on people without mode and click the give
+ verb, or use the hotkey CTRL G to offer it to everyone around you
+2021-01-25:
+ MrJWhit:
+ - bugfix: Alien radio code
+ - rscadd: Microwave can now be cleaned by a damp rag as well as soap.
+ - bugfix: Removes some unused code, and improves some other code.
+ - rscadd: The AI has a verb to look up and down z-levels
+ - bugfix: Making a monkey into a human doesn't unanchor random things on the tile
+ - bugfix: Makes a few slight improvements to drinking code
+ - tweak: Makes encryption keys be put in the hands of the user when able instead
+ of being dropped on the floor when removed from headsets
+ raspy-on-osu:
+ - refactor: ventcrawling
+ silicons:
+ - tweak: you can now shove yourself up in any intent, not just help.
+2021-01-27:
+ ArcaneMusic, ported by Hatterhat:
+ - rscadd: Strike a hydroponics tray with a fully-charged floral somatoray to lock
+ in a mutation.
+ - rscadd: Floral somatorays now have the ability to force a mutation in a plant.
+ This should drain the cell in a single shot, but we'll see.
+ - balance: Somatorays now take uranium to craft instead of radium.
+ Arturlang:
+ - rscadd: Actually adds a right click give option
+ - rscadd: Revenants can now clickdrag to throw stuff at people, with some items
+ doing various things at the same time.
+ DeltaFire15:
+ - bugfix: The woundmending rite no longer causes runtimes.
+ - bugfix: Ratvarian borgs can now use their tier-0 spells.
+ - balance: Ratvarian borgs can always use their assigned spells, if there is enough
+ power.
+ - admin: The heretic antag panel now shows their sacrifices & current sacrifice
+ targets.
+ - tweak: The heretic roundend report now shows their sacrifices and nonsacrificed
+ targets.
+ - bugfix: Living hearts can no longer select the same target as another living heart,
+ removing a certain problem.
+ Hatterhat:
+ - tweak: Department budget cards have been readded. TO THE CODE. NOT LOCKERS.
+ - tweak: Also budget cards now look more like every other ID - see tgstation#55001.
+ - balance: One of the contractor tablet's payouts has been raised from a small payout
+ to a medium payout.
+ - balance: The free golem ship's GPSes no longer start on. They were never meant
+ to, but they did.
+ - rscdel: Headsets can't be found on most legion corpses now.
+ - rscdel: The flash on the assistant corpse is gone, too.
+ MrJWhit:
+ - tweak: Remaps some air alarms for sanity.
+ SandPoot:
+ - bugfix: The drop circuit can no longer drop things that are not inside it.
+ raspy-on-osu:
+ - bugfix: bespoke ventcrawling element not detaching due to malformed call
+ shellspeed1:
+ - bugfix: Floorbots had had a software update, preventing them from dogpiling on
+ their target as easily as they did before.
+ - soundadd: Floorbots will now play a small chime when stacked on top of each other
+ to indicate that they're moving apart.
+ timothyteakettle:
+ - rscadd: blobs can use the 'me' verb
+ - admin: adminhelps and pms only sanitize once instead of twice
+2021-01-28:
+ silicons:
+ - rscadd: colormates can now paint some mobs.
+ - bugfix: 1 dev explosions shouldn't delete brains anymore
+2021-01-29:
+ MrJWhit:
+ - tweak: Ported the QM, Captain, CMO, and HoS cloaks from beestation.
+ - rscdel: Removes excess air alarms from boxstation
+ TripleShades:
+ - bugfix: fixes engineering secure storage being the wrong area because I fucked
+ that up previously my bad
+ - bugfix: removes funny extra light switch under right surgery table in surgery
+ oops
+ - rscadd: Added chairs to the corpse launch viewing area
+ - rscadd: Small garden plot for flowers for parity with other station Chapels
+ - rscadd: Plain Bible to glass tables in Chapel
+ - rscadd: Candles and Matchbox to glass tables in Chapel
+ - rscadd: More glass tables, with a chaplain figure and another spare bible.
+ - rscadd: Bookcase to Box Chapel for parity with other station Chapels
+ - rscadd: Minimoog to Box Chapel as substitute for a church organ
+ - rscadd: 'Holy department sign just below Chapel change: Expanded the corpse launching
+ area to feel less congested change: Added windows to the corpse launch so you
+ can look inside I guess? change: Moved flowers and burial garments to the corner
+ next to the corpse launcher change: Box Chaplain''s office door is moved over
+ one change: Confessional is now connected to Chaplain''s office for parity with
+ other station Chapels change: Moved coffins over to old confessional location
+ change: Box Chapel now has pews instead of stools change: Box Chapel Confessional
+ is now lit instead of being nearly pitch black remove: Two coffins from Chapel'
+ timothyteakettle:
+ - bugfix: the miner bedsheet will now increment its progress when you redeem points
+ from the ORM
+ - rscadd: you can add custom names and descriptions to item's on the loadout now
+ zeroisthebiggay:
+ - rscadd: roundstart aesthetic sterile masks and roundstart paper masks
+ - rscadd: more accessory slot items
+ - rscadd: cowbell necklace happy 2021
+ - rscadd: shibari ropes & torn pantyhose
+2021-01-30:
+ timothyteakettle:
+ - rscadd: adds 'clucks', 'caws' and 'gekkers' to the speech verb list
+ zeroisthebiggay:
+ - rscadd: some more FUCKING hairs
+ - imageadd: uncodersprites the advanced extinguisher
+2021-01-31:
+ Putnam3145:
+ - balance: fermichem explosion EMPs don't cover the entire station
+2021-02-02:
+ silicons:
+ - rscadd: pais can now be carried around piggybacking/fireman
+ - balance: Meth and Nuka Cola once again, speed you up.
+2021-02-03:
+ Hatterhat:
+ - bugfix: The green energy sabre's sprite now respects proper handedness.
+2021-02-05:
+ SmArtKar:
+ - rscadd: The orbit menu now has an Auto-Observe button! No more sifting through
+ the lame observe menu to snoop in people's backpacks! Also, orbit menu now refreshes.
+ - bugfix: KAs are no longer getting broken when fired by a circuit
+ keronshb:
+ - balance: Force and damage > 15 from 18/25
+ - balance: Knockdown put down to 5 from 30
+ - balance: Armor pen down to 10 from 100.
+ - balance: Makes cell chargers, charge faster.
+ raspy-on-osu:
+ - bugfix: alien royals can no longer ventcrawl
+ shellspeed1:
+ - balance: There actually needs to be people for zombies to happen now.
+ timothyteakettle:
+ - rscadd: dwarf facial hair is no longer randomised
+2021-02-07:
+ Thalpy:
+ - refactor: 'Dispenser: Adds the ability to store a small amount of reagents in
+ the machine itself for dispensing. Reacting recipies cannot be stored. Size
+ of storage increases with bin size.'
+ - refactor: 'Dispenser: Allows reagents to be color coded by pH'
+ - refactor: 'Dispenser: Each reagent displays it''s pH on hover'
+ - refactor: 'Dispenser: Allows the user to toggle between buttons and a radial dial'
+ - refactor: 'Dispenser: When the dispencer is upgraded it can dispense 5/3/2/1 volumes
+ based on rating refactor: Dispenser: as it was before. This does not break recorded
+ recipes.'
+ - tweak: Adds a round function to some numbers so they're not huge
+ - tweak: The Chem master can now get purity for all reagents when analysed
+ - bugfix: Synthissue fixes
+ - tweak: buffers now have a strong and weak variant. Weak can be dispensed, and
+ strong can be created. Strong buffers are 6x more effective.
+ - bugfix: Some buffer pH edge calculation fixes
+ TyrianTyrell:
+ - rscadd: added a signed language, that can't be used over the radio but can be
+ used if you're mute. also added the multilingual trait.
+ - imageadd: hopefully added an icon for the signed language.
+ - code_imp: changed how some traits function slightly.
+ dzahlus:
+ - tweak: tweaked a few sounds
+ - soundadd: added a new weapon sounds
+ - sounddel: removed old weapon sounds
+ - code_imp: changed some sound related code
+ silicons:
+ - rscadd: syndicate ablative armwraps have been added.
+2021-02-09:
+ Chiirno:
+ - rscadd: Adds clown waddle to clown shoes. Enhanced Clown Waddle Dampeners can
+ be engaged in-hand with ctrl+click, _but why would you?_
+ MrJWhit:
+ - rscadd: Re-adds theater disposal outlet, and makes dorms disposal able to have
+ things sent to it on boxstation.
+ TyrianTyrell:
+ - bugfix: made default tongue able to speak signed language.
+ timothyteakettle:
+ - balance: sentient viruses can now infect synths and ipcs
+2021-02-11:
+ Adelphon:
+ - rscadd: Charismatic Suit
+ - rscadd: Urban Jacket
+ DeltaFire15:
+ - tweak: Added nanogel to the robodrobe.
+ Putnam3145:
+ - rscadd: Config to keep unreadied players from mode voting
+ dzahlus:
+ - bugfix: fixes grenadelaunch.ogg being used where it shouldn't and makes mech weapons
+ use correct sound
+ keronshb:
+ - balance: 10 > 30 second for Warp Implant cooldown
+ - rscdel: Comments out power sink objective.
+ timothyteakettle:
+ - bugfix: persistent blood should stop being invisible and alt clicking it shouldn't
+ return the entire spritesheet
+ - admin: pickpocketing is now logged using log_combat
+ zeroisthebiggay:
+ - tweak: the aesthetic sterile mask no longer hides faces so you can cosplay egirls
+ and keep flavortexts
+2021-02-12:
+ Hatterhat:
+ - balance: The ATVs on SnowCabin.dmm have been replaced with snowmobiles.
+ MrJWhit:
+ - tweak: Random deltastation fixes.
+ - tweak: Gives boxstation vault door actual vault door access
+ silicons:
+ - balance: Voice of God - sleep removed, stun staggers instead, knockdown is faster
+ but does not do stamina damage, vomit is faster but doesn't stun
+2021-02-13:
+ Hatterhat:
+ - balance: Energy bolas now take 2.5 seconds to remove and dissipate on removal.
+ timothyteakettle:
+ - admin: migration error to version 39+ of savefiles is now logged instead of messaging
+ all online admins in the chat
+2021-02-14:
+ DeltaFire15:
+ - admin: The antag panel now correctly shows the names of cultist / clockcult datum
+ subtypes.
+ - bugfix: Adding clock cultists via the admin panel now works correctly.
+ - bugfix: Xeno larvae should now be able to ventcrawl again.
+ Hatterhat:
+ - tweak: Repairing sensors on jumpsuits now requires a fully-intact jumpsuit. Find
+ some cloth.
+ - tweak: Durathread armor kits now require you to have a fully-repaired jumpsuit,
+ first, with no attachments.
+ - bugfix: Durathread armor kits now no longer weave the entirety of the jumpsuit
+ armor universe into having armor.
+ TyrianTyrell:
+ - code_imp: added a define for multilingual granted languages, and changed the multilingual
+ trait to use it.
+2021-02-15:
+ Adelphon:
+ - rscadd: polychromatic shoes
+ - rscadd: polychromatic windbreaker
+ - rscadd: polychromatic canvas cloak
+ - bugfix: digitigrade charismatic suit texture
+ DeltaFire15:
+ - balance: Kneecapped pugilist parries somewhat.
+ - balance: Slightly nerfed default unarmed parries.
+ - balance: Slightly nerfed traitor armwrap parries.
+ - bugfix: Pugilist parries now cannot perfectly defend against projectiles, as they
+ were supposed to.
+ - bugfix: Some parrying numbers that one would think were in seconds didn't have
+ the SECONDS. I added those.
+ - balance: Clock cultists now yell alot less when invoking scripture.
+ dzahlus:
+ - rscadd: Added new emote
+ - soundadd: added a new emote sound
+ silicons:
+ - balance: people on the ground hit less hard in unarmed combat. rng miss remove
+ from punches.
+ - bugfix: chat highlighting no longer drops half your entered words.
+2021-02-16:
+ silicons:
+ - config: sprint removal entry added, UI will revert to old UI while this is active.
+2021-02-18:
+ BlueWildrose:
+ - admin: Admins now receive messages regarding certain holodeck actions.
+ Hatterhat:
+ - bugfix: Free Golem Ship GPSes now start as disabled. Like they were supposed to.
+ LetterN:
+ - tweak: No more liver damage when you opt out of "hornychems"
+ SmArtKar:
+ - rscadd: Added a new TCG card game
+ dzahlus:
+ - rscdel: Removed maroon objective due to toxic gameplay behaviour
+ shellspeed1:
+ - bugfix: floor bots place plating before tiles now.
+ - bugfix: gets rid of another tile duplication issue.
+ silicons:
+ - spellcheck: priviledge --> privilege
+2021-02-19:
+ Putnam3145:
+ - bugfix: Buzz Fuzz's addiction threshold is now a can and a sip as intended.
+ timothyteakettle:
+ - admin: staring into pierced realities is now logged
diff --git a/html/changelogs/AutoChangeLog-pr-13014.yml b/html/changelogs/AutoChangeLog-pr-13014.yml
deleted file mode 100644
index 861e797669..0000000000
--- a/html/changelogs/AutoChangeLog-pr-13014.yml
+++ /dev/null
@@ -1,4 +0,0 @@
-author: "Hatterhat"
-delete-after: True
-changes:
- - rscadd: "The wastes of Lavaland and the icy caverns of Snow Taxi rumble in unison."
diff --git a/html/changelogs/AutoChangeLog-pr-13193.yml b/html/changelogs/AutoChangeLog-pr-13193.yml
deleted file mode 100644
index 980a9366d8..0000000000
--- a/html/changelogs/AutoChangeLog-pr-13193.yml
+++ /dev/null
@@ -1,4 +0,0 @@
-author: "silicons"
-delete-after: True
-changes:
- - tweak: "medium screens are better now"
diff --git a/html/changelogs/AutoChangeLog-pr-13233.yml b/html/changelogs/AutoChangeLog-pr-13233.yml
deleted file mode 100644
index 4366abec64..0000000000
--- a/html/changelogs/AutoChangeLog-pr-13233.yml
+++ /dev/null
@@ -1,6 +0,0 @@
-author: "Hatterhat"
-delete-after: True
-changes:
- - rscadd: "Changeling bone gauntlets! They punch the shit out of people really good."
- - tweak: "Guerilla gloves and gorilla gloves inherit the strip modifiers of their predecessors, because apparently they had those."
- - balance: "Pugilists now always hit the targeted limb and never miss."
diff --git a/html/changelogs/AutoChangeLog-pr-13252.yml b/html/changelogs/AutoChangeLog-pr-13252.yml
deleted file mode 100644
index 5de40bb80b..0000000000
--- a/html/changelogs/AutoChangeLog-pr-13252.yml
+++ /dev/null
@@ -1,4 +0,0 @@
-author: "timothyteakettle"
-delete-after: True
-changes:
- - tweak: "looking at loadout equips loadout items on your preview image instead of job items"
diff --git a/html/changelogs/AutoChangeLog-pr-13346.yml b/html/changelogs/AutoChangeLog-pr-13346.yml
deleted file mode 100644
index 2e3d4e3280..0000000000
--- a/html/changelogs/AutoChangeLog-pr-13346.yml
+++ /dev/null
@@ -1,4 +0,0 @@
-author: "Putnam3145"
-delete-after: True
-changes:
- - refactor: "Dwarf speech is no longer absolutely paranoid about word replacement."
diff --git a/html/changelogs/AutoChangeLog-pr-13349.yml b/html/changelogs/AutoChangeLog-pr-13349.yml
deleted file mode 100644
index 2469b31ecd..0000000000
--- a/html/changelogs/AutoChangeLog-pr-13349.yml
+++ /dev/null
@@ -1,4 +0,0 @@
-author: "LetterN"
-delete-after: True
-changes:
- - code_imp: "Updates git and build tests."
diff --git a/html/changelogs/AutoChangeLog-pr-13405.yml b/html/changelogs/AutoChangeLog-pr-13405.yml
deleted file mode 100644
index 176e886b0d..0000000000
--- a/html/changelogs/AutoChangeLog-pr-13405.yml
+++ /dev/null
@@ -1,4 +0,0 @@
-author: "silicons"
-delete-after: True
-changes:
- - tweak: "the warp implant now actually warps you back 10 seconds. leaves a trail, though. now unlimited us."
diff --git a/html/changelogs/AutoChangeLog-pr-13444.yml b/html/changelogs/AutoChangeLog-pr-13444.yml
deleted file mode 100644
index d24babda2e..0000000000
--- a/html/changelogs/AutoChangeLog-pr-13444.yml
+++ /dev/null
@@ -1,4 +0,0 @@
-author: "timothyteakettle"
-delete-after: True
-changes:
- - tweak: "you can now get a family heirlooms based off your species instead of job"
diff --git a/html/changelogs/AutoChangeLog-pr-13461.yml b/html/changelogs/AutoChangeLog-pr-13461.yml
deleted file mode 100644
index e2397a7aa0..0000000000
--- a/html/changelogs/AutoChangeLog-pr-13461.yml
+++ /dev/null
@@ -1,4 +0,0 @@
-author: "Detective-Google"
-delete-after: True
-changes:
- - rscadd: "arcade carpet"
diff --git a/html/changelogs/AutoChangeLog-pr-13472.yml b/html/changelogs/AutoChangeLog-pr-13472.yml
deleted file mode 100644
index 8e8d043de6..0000000000
--- a/html/changelogs/AutoChangeLog-pr-13472.yml
+++ /dev/null
@@ -1,4 +0,0 @@
-author: "timothyteakettle"
-delete-after: True
-changes:
- - rscadd: "roundstart slimes can turn into puddles now"
diff --git a/html/changelogs/AutoChangeLog-pr-13473.yml b/html/changelogs/AutoChangeLog-pr-13473.yml
deleted file mode 100644
index aebdfbb3cb..0000000000
--- a/html/changelogs/AutoChangeLog-pr-13473.yml
+++ /dev/null
@@ -1,4 +0,0 @@
-author: "Tupinambis"
-delete-after: True
-changes:
- - rscadd: "Arachnids (spider people) with limited night vision, flash vulnerability, and webbing."
diff --git a/html/changelogs/AutoChangeLog-pr-13479.yml b/html/changelogs/AutoChangeLog-pr-13479.yml
deleted file mode 100644
index fcfe65a47e..0000000000
--- a/html/changelogs/AutoChangeLog-pr-13479.yml
+++ /dev/null
@@ -1,5 +0,0 @@
-author: "LetterN"
-delete-after: True
-changes:
- - bugfix: "minimap text"
- - code_imp: "ports cinematic upgrades"
diff --git a/html/changelogs/AutoChangeLog-pr-13481.yml b/html/changelogs/AutoChangeLog-pr-13481.yml
deleted file mode 100644
index f6049c552b..0000000000
--- a/html/changelogs/AutoChangeLog-pr-13481.yml
+++ /dev/null
@@ -1,6 +0,0 @@
-author: "DeltaFire15"
-delete-after: True
-changes:
- - bugfix: "the blacksmithing skill now works properly"
- - tweak: "Anvils cannot be interacted with with hammers whilst they are already being used"
- - tweak: "If someone has no gloves when interacting with heated ingots, they no longer ignore their effects."
diff --git a/html/changelogs/AutoChangeLog-pr-13483.yml b/html/changelogs/AutoChangeLog-pr-13483.yml
deleted file mode 100644
index 1db9304ffb..0000000000
--- a/html/changelogs/AutoChangeLog-pr-13483.yml
+++ /dev/null
@@ -1,4 +0,0 @@
-author: "DeltaFire15"
-delete-after: True
-changes:
- - bugfix: "The Revenant self-revive ability is no longer broken."
diff --git a/html/changelogs/AutoChangeLog-pr-13487.yml b/html/changelogs/AutoChangeLog-pr-13487.yml
deleted file mode 100644
index 4b0f92adfb..0000000000
--- a/html/changelogs/AutoChangeLog-pr-13487.yml
+++ /dev/null
@@ -1,4 +0,0 @@
-author: "DeltaFire15"
-delete-after: True
-changes:
- - bugfix: "People installing KA modkits in miner borgs is no longer broken."
diff --git a/html/changelogs/AutoChangeLog-pr-13496.yml b/html/changelogs/AutoChangeLog-pr-13496.yml
deleted file mode 100644
index 30308efaff..0000000000
--- a/html/changelogs/AutoChangeLog-pr-13496.yml
+++ /dev/null
@@ -1,4 +0,0 @@
-author: "Detective-Google"
-delete-after: True
-changes:
- - rscadd: "explosions now get broadcasted to deadchat."
diff --git a/html/changelogs/AutoChangeLog-pr-13497.yml b/html/changelogs/AutoChangeLog-pr-13497.yml
deleted file mode 100644
index c5f569bad3..0000000000
--- a/html/changelogs/AutoChangeLog-pr-13497.yml
+++ /dev/null
@@ -1,5 +0,0 @@
-author: "Zandario"
-delete-after: True
-changes:
- - code_imp: "Added some framework for future species expansions, including clothing refitting."
- - refactor: "Made majority of the relevant Species IDs and Categories pre-defined, also for easier expansion and use."
diff --git a/html/changelogs/AutoChangeLog-pr-13498.yml b/html/changelogs/AutoChangeLog-pr-13498.yml
deleted file mode 100644
index f956ee4b07..0000000000
--- a/html/changelogs/AutoChangeLog-pr-13498.yml
+++ /dev/null
@@ -1,5 +0,0 @@
-author: "Bhijn"
-delete-after: True
-changes:
- - tweak: "Changeling loudness is now determined as an average of all their abilities, rather than the sum"
- - tweak: "To compensate for this, blood tests now require a loudness value of 1 or higher to detect ling blood. Additionally, blood test explosions are now triggered only when the loudness value is higher than 2."
diff --git a/html/changelogs/AutoChangeLog-pr-13499.yml b/html/changelogs/AutoChangeLog-pr-13499.yml
deleted file mode 100644
index 804fa9fc34..0000000000
--- a/html/changelogs/AutoChangeLog-pr-13499.yml
+++ /dev/null
@@ -1,4 +0,0 @@
-author: "Putnam3145"
-delete-after: True
-changes:
- - bugfix: "Toilet loot spawners don't lag the server on server start with forced hard dels."
diff --git a/html/changelogs/AutoChangeLog-pr-13500.yml b/html/changelogs/AutoChangeLog-pr-13500.yml
deleted file mode 100644
index 7ba1eb64f3..0000000000
--- a/html/changelogs/AutoChangeLog-pr-13500.yml
+++ /dev/null
@@ -1,5 +0,0 @@
-author: "LetterN"
-delete-after: True
-changes:
- - rscadd: "2 more ways to get up from z1"
- - tweak: "tweaked the z2 garden to be less blank"
diff --git a/html/changelogs/AutoChangeLog-pr-13501.yml b/html/changelogs/AutoChangeLog-pr-13501.yml
deleted file mode 100644
index dcdd868e37..0000000000
--- a/html/changelogs/AutoChangeLog-pr-13501.yml
+++ /dev/null
@@ -1,4 +0,0 @@
-author: "Putnam3145"
-delete-after: True
-changes:
- - bugfix: "Holofirelocks work now."
diff --git a/html/changelogs/AutoChangeLog-pr-13503.yml b/html/changelogs/AutoChangeLog-pr-13503.yml
deleted file mode 100644
index c68eaf44f0..0000000000
--- a/html/changelogs/AutoChangeLog-pr-13503.yml
+++ /dev/null
@@ -1,5 +0,0 @@
-author: "Hatterhat"
-delete-after: True
-changes:
- - rscadd: "Survival daggers! A slightly more expensive survival knife that comes with a brighter flashlight. On the blade."
- - tweak: "Luxury pod capsules look different from normal capsules."
diff --git a/html/changelogs/AutoChangeLog-pr-13504.yml b/html/changelogs/AutoChangeLog-pr-13504.yml
deleted file mode 100644
index 7f59b120b6..0000000000
--- a/html/changelogs/AutoChangeLog-pr-13504.yml
+++ /dev/null
@@ -1,6 +0,0 @@
-author: "zeroisthebiggay"
-delete-after: True
-changes:
- - rscadd: "gravitokinetic stands from tg"
- - balance: "buffs stands overall"
- - bugfix: "protector stands no longer become tposing invisible apes sometimes"
diff --git a/html/changelogs/AutoChangeLog-pr-13509.yml b/html/changelogs/AutoChangeLog-pr-13509.yml
deleted file mode 100644
index e666a6b2a4..0000000000
--- a/html/changelogs/AutoChangeLog-pr-13509.yml
+++ /dev/null
@@ -1,6 +0,0 @@
-author: "EmeraldSundisk"
-delete-after: True
-changes:
- - balance: "The \"Skelter ruin\" now has stechkins as opposed to M1911s"
- - tweak: "Skelter's decorative bullet casings replaced to factor in the change in caliber"
- - rscadd: "Skelter now has a combat knife and fluff note"
diff --git a/html/changelogs/AutoChangeLog-pr-13511.yml b/html/changelogs/AutoChangeLog-pr-13511.yml
deleted file mode 100644
index e819d8752d..0000000000
--- a/html/changelogs/AutoChangeLog-pr-13511.yml
+++ /dev/null
@@ -1,4 +0,0 @@
-author: "Hatterhat"
-delete-after: True
-changes:
- - imageadd: "The Syndicate appear to be issuing new revolver variants."
diff --git a/html/changelogs/AutoChangeLog-pr-13512.yml b/html/changelogs/AutoChangeLog-pr-13512.yml
deleted file mode 100644
index f96f13a156..0000000000
--- a/html/changelogs/AutoChangeLog-pr-13512.yml
+++ /dev/null
@@ -1,4 +0,0 @@
-author: "Hatterhat"
-delete-after: True
-changes:
- - bugfix: "Cryogenics now screams on common again when your fuckbuddy heads out."
diff --git a/html/changelogs/AutoChangeLog-pr-13513.yml b/html/changelogs/AutoChangeLog-pr-13513.yml
deleted file mode 100644
index 0cff979e8c..0000000000
--- a/html/changelogs/AutoChangeLog-pr-13513.yml
+++ /dev/null
@@ -1,4 +0,0 @@
-author: "timothyteakettle"
-delete-after: True
-changes:
- - rscadd: "you can now pick your eye sprites from customization"
diff --git a/html/changelogs/AutoChangeLog-pr-13514.yml b/html/changelogs/AutoChangeLog-pr-13514.yml
deleted file mode 100644
index bd1605fb96..0000000000
--- a/html/changelogs/AutoChangeLog-pr-13514.yml
+++ /dev/null
@@ -1,4 +0,0 @@
-author: "Thalpy"
-delete-after: True
-changes:
- - bugfix: "fixes some bugs in jacqs code from edits to the codebase"
diff --git a/html/changelogs/AutoChangeLog-pr-13516.yml b/html/changelogs/AutoChangeLog-pr-13516.yml
deleted file mode 100644
index 30e22f4f48..0000000000
--- a/html/changelogs/AutoChangeLog-pr-13516.yml
+++ /dev/null
@@ -1,4 +0,0 @@
-author: "yorii"
-delete-after: True
-changes:
- - bugfix: "fixed botany rounding error that caused grass and other plants to misbehave"
diff --git a/html/changelogs/AutoChangeLog-pr-13517.yml b/html/changelogs/AutoChangeLog-pr-13517.yml
deleted file mode 100644
index 8f29517058..0000000000
--- a/html/changelogs/AutoChangeLog-pr-13517.yml
+++ /dev/null
@@ -1,4 +0,0 @@
-author: "silicons"
-delete-after: True
-changes:
- - bugfix: "simple mobs are now immune to radioactive contamination"
diff --git a/html/changelogs/AutoChangeLog-pr-13518.yml b/html/changelogs/AutoChangeLog-pr-13518.yml
deleted file mode 100644
index 565754f48b..0000000000
--- a/html/changelogs/AutoChangeLog-pr-13518.yml
+++ /dev/null
@@ -1,4 +0,0 @@
-author: "TheObserver-sys"
-delete-after: True
-changes:
- - bugfix: "Drake? Where's the dead fairygrass sprite?"
diff --git a/html/changelogs/AutoChangeLog-pr-13519.yml b/html/changelogs/AutoChangeLog-pr-13519.yml
deleted file mode 100644
index 0c4978a7d8..0000000000
--- a/html/changelogs/AutoChangeLog-pr-13519.yml
+++ /dev/null
@@ -1,4 +0,0 @@
-author: "Detective-Google"
-delete-after: True
-changes:
- - rscadd: "Lick radial"
diff --git a/html/changelogs/AutoChangeLog-pr-13521.yml b/html/changelogs/AutoChangeLog-pr-13521.yml
deleted file mode 100644
index 77aca8c363..0000000000
--- a/html/changelogs/AutoChangeLog-pr-13521.yml
+++ /dev/null
@@ -1,5 +0,0 @@
-author: "DeltaFire15"
-delete-after: True
-changes:
- - balance: "zeolites are now actual fermichems instead of being incredibly easy to make."
- - bugfix: "Using syringes / droppers on chem heaters with beakers in them works again."
diff --git a/html/changelogs/AutoChangeLog-pr-13523.yml b/html/changelogs/AutoChangeLog-pr-13523.yml
deleted file mode 100644
index ac2019bb88..0000000000
--- a/html/changelogs/AutoChangeLog-pr-13523.yml
+++ /dev/null
@@ -1,4 +0,0 @@
-author: "Detective-Google"
-delete-after: True
-changes:
- - bugfix: "arcade carpets now actually work"
diff --git a/html/changelogs/AutoChangeLog-pr-13525.yml b/html/changelogs/AutoChangeLog-pr-13525.yml
deleted file mode 100644
index eb441f04c3..0000000000
--- a/html/changelogs/AutoChangeLog-pr-13525.yml
+++ /dev/null
@@ -1,4 +0,0 @@
-author: "Detective-Google"
-delete-after: True
-changes:
- - bugfix: "Hilbert's jukebox works"
diff --git a/html/changelogs/AutoChangeLog-pr-13526.yml b/html/changelogs/AutoChangeLog-pr-13526.yml
deleted file mode 100644
index 104b76bd94..0000000000
--- a/html/changelogs/AutoChangeLog-pr-13526.yml
+++ /dev/null
@@ -1,4 +0,0 @@
-author: "Putnam3145"
-delete-after: True
-changes:
- - bugfix: "vore prefs save now"
diff --git a/html/changelogs/AutoChangeLog-pr-13527.yml b/html/changelogs/AutoChangeLog-pr-13527.yml
deleted file mode 100644
index 7e65116e83..0000000000
--- a/html/changelogs/AutoChangeLog-pr-13527.yml
+++ /dev/null
@@ -1,4 +0,0 @@
-author: "ArchieBeepBoop"
-delete-after: True
-changes:
- - rscadd: "Upgraded Advanced RTG Machine Preset"
diff --git a/html/changelogs/AutoChangeLog-pr-13528.yml b/html/changelogs/AutoChangeLog-pr-13528.yml
deleted file mode 100644
index b7bd0d4618..0000000000
--- a/html/changelogs/AutoChangeLog-pr-13528.yml
+++ /dev/null
@@ -1,11 +0,0 @@
-author: "DeltaFire15"
-delete-after: True
-changes:
- - balance: "Robotic Limbs now each have their own damage threshhold values"
- - balance: "Robotic Limb damage threshholds are now seperated into threshhold itself and mindamage when passed
-balance; Hybrid limbs can now be injected with hypos, but not sprayed (Still not healed by chems)"
- - tweak: "Brain surgery has been tweaked back to allowing robotic limbs, blacklisting IPC brains instead."
- - tweak: "Robot brain surgery can now be used on organic heads, if there is a IPC brain in them somehow."
- - tweak: "The robot limb heal surgery can now be used even if the target's torso is not robotic, as long as they have robotic limbs"
- - refactor: "BODYPART_ROBOTIC / BODYPART_ORGANIC checks replaced with helper-procs whereever possible."
- - code_imp: "Added a BODYPART_HYBRID define for robotic bodyparts that behave organic in some regards."
diff --git a/html/changelogs/AutoChangeLog-pr-13529.yml b/html/changelogs/AutoChangeLog-pr-13529.yml
deleted file mode 100644
index 54f775b5c8..0000000000
--- a/html/changelogs/AutoChangeLog-pr-13529.yml
+++ /dev/null
@@ -1,4 +0,0 @@
-author: "Putnam3145"
-delete-after: True
-changes:
- - tweak: "Planetary atmos no longer does superconduction."
diff --git a/html/changelogs/AutoChangeLog-pr-13530.yml b/html/changelogs/AutoChangeLog-pr-13530.yml
deleted file mode 100644
index b99ed1c545..0000000000
--- a/html/changelogs/AutoChangeLog-pr-13530.yml
+++ /dev/null
@@ -1,4 +0,0 @@
-author: "silicons"
-delete-after: True
-changes:
- - rscadd: "Clowns now have unpredictable effects on supermatter crystals when dusting from contact."
diff --git a/html/changelogs/AutoChangeLog-pr-13531.yml b/html/changelogs/AutoChangeLog-pr-13531.yml
deleted file mode 100644
index 3c138ef98d..0000000000
--- a/html/changelogs/AutoChangeLog-pr-13531.yml
+++ /dev/null
@@ -1,4 +0,0 @@
-author: "DeltaFire15"
-delete-after: True
-changes:
- - bugfix: "A certain lizard (totally not me) being stupid is no longer going to break regenerate_bodyparts"
diff --git a/html/changelogs/AutoChangeLog-pr-13533.yml b/html/changelogs/AutoChangeLog-pr-13533.yml
deleted file mode 100644
index 1ba14c689c..0000000000
--- a/html/changelogs/AutoChangeLog-pr-13533.yml
+++ /dev/null
@@ -1,4 +0,0 @@
-author: "shellspeed1"
-delete-after: True
-changes:
- - rscadd: "A new recipe for a spicy has been given to us by a strange business man."
diff --git a/html/changelogs/AutoChangeLog-pr-13535.yml b/html/changelogs/AutoChangeLog-pr-13535.yml
deleted file mode 100644
index b020587eb8..0000000000
--- a/html/changelogs/AutoChangeLog-pr-13535.yml
+++ /dev/null
@@ -1,7 +0,0 @@
-author: "Hatterhat"
-delete-after: True
-changes:
- - rscadd: "Energy sabre reskin for the energy sword - access via alt-click."
- - bugfix: "Alt-click reskins are fixed."
- - tweak: "Defibrillators and their many, many overlays were moved to another .dmi."
- - tweak: "You can now change the color of an energy sword via multitool. Not deswords. Yet."
diff --git a/html/changelogs/AutoChangeLog-pr-13539.yml b/html/changelogs/AutoChangeLog-pr-13539.yml
deleted file mode 100644
index a1f3df4fd0..0000000000
--- a/html/changelogs/AutoChangeLog-pr-13539.yml
+++ /dev/null
@@ -1,4 +0,0 @@
-author: "timothyteakettle"
-delete-after: True
-changes:
- - rscdel: "removes two debug messages left in from my prior eye customization pr"
diff --git a/html/changelogs/AutoChangeLog-pr-13540.yml b/html/changelogs/AutoChangeLog-pr-13540.yml
deleted file mode 100644
index 0d7d9b8d2c..0000000000
--- a/html/changelogs/AutoChangeLog-pr-13540.yml
+++ /dev/null
@@ -1,6 +0,0 @@
-author: "ArcaneMusic, The0bserver-sys"
-delete-after: True
-changes:
- - rscadd: "New from Hydrowear LLC: The Botanical Belt! This handy yellow belt lets you hold most of your botany gear, and a few beakers for reduced bag and floor clutter!"
- - tweak: "Gives Hydrotrays plumbing pipes automatically, allowing you to make a self sustaining tray via plumbing."
- - tweak: "Gives Service access to Bluespace Beakers, at last, gives Cargo, Science, and Medical the ability to construct reinforced plungers for use on lavaland."
diff --git a/html/changelogs/AutoChangeLog-pr-13543.yml b/html/changelogs/AutoChangeLog-pr-13543.yml
deleted file mode 100644
index be2cb215c9..0000000000
--- a/html/changelogs/AutoChangeLog-pr-13543.yml
+++ /dev/null
@@ -1,5 +0,0 @@
-author: "zeroisthebiggay"
-delete-after: True
-changes:
- - rscadd: "The legion megafauna has been reworked. The fight should now be both slightly harder and faster."
- - balance: "You can no longer cheese the colossus by being a sand golem and simply being immune."
diff --git a/html/changelogs/AutoChangeLog-pr-13544.yml b/html/changelogs/AutoChangeLog-pr-13544.yml
deleted file mode 100644
index 61cf99090d..0000000000
--- a/html/changelogs/AutoChangeLog-pr-13544.yml
+++ /dev/null
@@ -1,4 +0,0 @@
-author: "DeltaFire15"
-delete-after: True
-changes:
- - bugfix: "Portals no longer runtime because of incorrect args."
diff --git a/html/changelogs/AutoChangeLog-pr-13547.yml b/html/changelogs/AutoChangeLog-pr-13547.yml
deleted file mode 100644
index 0355a871d1..0000000000
--- a/html/changelogs/AutoChangeLog-pr-13547.yml
+++ /dev/null
@@ -1,4 +0,0 @@
-author: "zeroisthebiggay"
-delete-after: True
-changes:
- - rscadd: "secsheath for your cool stunsword at your local security vendor. you gotta hack it first though."
diff --git a/html/changelogs/AutoChangeLog-pr-13549.yml b/html/changelogs/AutoChangeLog-pr-13549.yml
deleted file mode 100644
index 5d46fbcb6c..0000000000
--- a/html/changelogs/AutoChangeLog-pr-13549.yml
+++ /dev/null
@@ -1,4 +0,0 @@
-author: "BlueWildrose"
-delete-after: True
-changes:
- - bugfix: "Fixes cloning computer UI not updating when pressing certain buttons - also adds extra check for names to update a message"
diff --git a/html/changelogs/AutoChangeLog-pr-13552.yml b/html/changelogs/AutoChangeLog-pr-13552.yml
deleted file mode 100644
index 1504d1d3a0..0000000000
--- a/html/changelogs/AutoChangeLog-pr-13552.yml
+++ /dev/null
@@ -1,4 +0,0 @@
-author: "Putnam3145"
-delete-after: True
-changes:
- - bugfix: "Multi-surgery unit test no longer fails at random."
diff --git a/html/changelogs/AutoChangeLog-pr-13553.yml b/html/changelogs/AutoChangeLog-pr-13553.yml
deleted file mode 100644
index 2759fa2754..0000000000
--- a/html/changelogs/AutoChangeLog-pr-13553.yml
+++ /dev/null
@@ -1,4 +0,0 @@
-author: "timothyteakettle"
-delete-after: True
-changes:
- - bugfix: "eye sprites should look normal once more"
diff --git a/html/changelogs/AutoChangeLog-pr-13554.yml b/html/changelogs/AutoChangeLog-pr-13554.yml
deleted file mode 100644
index 3a14adff37..0000000000
--- a/html/changelogs/AutoChangeLog-pr-13554.yml
+++ /dev/null
@@ -1,4 +0,0 @@
-author: "Vynzill"
-delete-after: True
-changes:
- - bugfix: "fixes high luminosity eyes"
diff --git a/html/changelogs/AutoChangeLog-pr-13558.yml b/html/changelogs/AutoChangeLog-pr-13558.yml
deleted file mode 100644
index 2a5b2dc576..0000000000
--- a/html/changelogs/AutoChangeLog-pr-13558.yml
+++ /dev/null
@@ -1,5 +0,0 @@
-author: "Zandario"
-delete-after: True
-changes:
- - bugfix: "lum slime sprites work again"
- - code_imp: "Slapped the Species Defines where relevant"
diff --git a/html/changelogs/AutoChangeLog-pr-13561.yml b/html/changelogs/AutoChangeLog-pr-13561.yml
deleted file mode 100644
index 097336bc3b..0000000000
--- a/html/changelogs/AutoChangeLog-pr-13561.yml
+++ /dev/null
@@ -1,4 +0,0 @@
-author: "DeltaFire15"
-delete-after: True
-changes:
- - bugfix: "Your target cryoing will no longer give you a free greentext."
diff --git a/html/changelogs/AutoChangeLog-pr-13562.yml b/html/changelogs/AutoChangeLog-pr-13562.yml
deleted file mode 100644
index 7fabc05c7b..0000000000
--- a/html/changelogs/AutoChangeLog-pr-13562.yml
+++ /dev/null
@@ -1,4 +0,0 @@
-author: "DeltaFire15"
-delete-after: True
-changes:
- - bugfix: "Vampire shapeshifting should now behave as intended"
diff --git a/html/changelogs/AutoChangeLog-pr-13563.yml b/html/changelogs/AutoChangeLog-pr-13563.yml
deleted file mode 100644
index c4c9b68c39..0000000000
--- a/html/changelogs/AutoChangeLog-pr-13563.yml
+++ /dev/null
@@ -1,4 +0,0 @@
-author: "timothyteakettle"
-delete-after: True
-changes:
- - tweak: "cloning now correctly copies your blood colour, body sprite type and eye type"
diff --git a/html/changelogs/AutoChangeLog-pr-13566.yml b/html/changelogs/AutoChangeLog-pr-13566.yml
deleted file mode 100644
index 14ee8755a9..0000000000
--- a/html/changelogs/AutoChangeLog-pr-13566.yml
+++ /dev/null
@@ -1,4 +0,0 @@
-author: "zeroisthebiggay"
-delete-after: True
-changes:
- - bugfix: "legion now drops chests"
diff --git a/html/changelogs/AutoChangeLog-pr-13567.yml b/html/changelogs/AutoChangeLog-pr-13567.yml
deleted file mode 100644
index d51db8e3b8..0000000000
--- a/html/changelogs/AutoChangeLog-pr-13567.yml
+++ /dev/null
@@ -1,8 +0,0 @@
-author: "timothyteakettle"
-delete-after: True
-changes:
- - tweak: "changeling stings retract upon turning into a slime puddle"
- - tweak: "you cannot transform into a slime puddle with a no drop item in your hands"
- - tweak: "slime puddles are now transparent and their colour looks more natural in comparison to the user"
- - tweak: "slime puddles are now even slower"
- - tweak: "slime puddles now get no protection from worn clothing"
diff --git a/html/changelogs/AutoChangeLog-pr-13570.yml b/html/changelogs/AutoChangeLog-pr-13570.yml
deleted file mode 100644
index 6a4fb6af66..0000000000
--- a/html/changelogs/AutoChangeLog-pr-13570.yml
+++ /dev/null
@@ -1,4 +0,0 @@
-author: "Putnam3145"
-delete-after: True
-changes:
- - bugfix: "Fixed a runtime in every healing nanite program."
diff --git a/html/changelogs/AutoChangeLog-pr-13571.yml b/html/changelogs/AutoChangeLog-pr-13571.yml
deleted file mode 100644
index 864967dffc..0000000000
--- a/html/changelogs/AutoChangeLog-pr-13571.yml
+++ /dev/null
@@ -1,4 +0,0 @@
-author: "MrJWhit"
-delete-after: True
-changes:
- - bugfix: "Code improvement on ventcrawling"
diff --git a/html/changelogs/AutoChangeLog-pr-13573.yml b/html/changelogs/AutoChangeLog-pr-13573.yml
deleted file mode 100644
index 9bac0ce44d..0000000000
--- a/html/changelogs/AutoChangeLog-pr-13573.yml
+++ /dev/null
@@ -1,4 +0,0 @@
-author: "Putnam3145"
-delete-after: True
-changes:
- - bugfix: "removed a unit test causing master to fail"
diff --git a/html/changelogs/AutoChangeLog-pr-13575.yml b/html/changelogs/AutoChangeLog-pr-13575.yml
deleted file mode 100644
index 164581b11f..0000000000
--- a/html/changelogs/AutoChangeLog-pr-13575.yml
+++ /dev/null
@@ -1,5 +0,0 @@
-author: "BlueWildrose"
-delete-after: True
-changes:
- - bugfix: "Fixed the subtle hotkey being weird with its input prompts."
- - rscadd: "Adds a subtler anti-ghost hotkey. Default key is 6."
diff --git a/html/changelogs/AutoChangeLog-pr-13576.yml b/html/changelogs/AutoChangeLog-pr-13576.yml
deleted file mode 100644
index 9443b13dcb..0000000000
--- a/html/changelogs/AutoChangeLog-pr-13576.yml
+++ /dev/null
@@ -1,5 +0,0 @@
-author: "Sonic121x"
-delete-after: True
-changes:
- - rscadd: "digi sprite uniform"
- - bugfix: "digi leg suit"
diff --git a/html/changelogs/AutoChangeLog-pr-13577.yml b/html/changelogs/AutoChangeLog-pr-13577.yml
deleted file mode 100644
index 7463a3ad39..0000000000
--- a/html/changelogs/AutoChangeLog-pr-13577.yml
+++ /dev/null
@@ -1,4 +0,0 @@
-author: "Putnam3145"
-delete-after: True
-changes:
- - bugfix: "Chemical stuff now displays fermichem stuff properly"
diff --git a/html/changelogs/AutoChangeLog-pr-13581.yml b/html/changelogs/AutoChangeLog-pr-13581.yml
deleted file mode 100644
index 42db54450b..0000000000
--- a/html/changelogs/AutoChangeLog-pr-13581.yml
+++ /dev/null
@@ -1,6 +0,0 @@
-author: "Ghommie, porting PRs by MMMiracles and pireamaineach, credits to BlueWildrose too."
-delete-after: True
-changes:
- - rscadd: "You can now draw on plasmaman helmets with a crayon to turn their frown upside-down."
- - balance: "Plasmaman helmets no longer hide your identity when worn by themselves."
- - balance: "Plasmaman helmets now have welding visors, which can't stack with their torches in the helmet and are visible."
diff --git a/html/changelogs/AutoChangeLog-pr-13582.yml b/html/changelogs/AutoChangeLog-pr-13582.yml
deleted file mode 100644
index 78f8be1cd0..0000000000
--- a/html/changelogs/AutoChangeLog-pr-13582.yml
+++ /dev/null
@@ -1,5 +0,0 @@
-author: "timothyteakettle"
-delete-after: True
-changes:
- - bugfix: "a tonne of fixes to colourisation of parts, too many to name, including some sprite fixes"
- - rscadd: "things now have their own individual primary/(secondary)/(tertiary) colours as required, and these can be modified by you"
diff --git a/html/changelogs/AutoChangeLog-pr-13585.yml b/html/changelogs/AutoChangeLog-pr-13585.yml
deleted file mode 100644
index 0369e0827f..0000000000
--- a/html/changelogs/AutoChangeLog-pr-13585.yml
+++ /dev/null
@@ -1,4 +0,0 @@
-author: "BlueWildrose"
-delete-after: True
-changes:
- - bugfix: "Fixed species-specific drinks not giving a mood boost if you are that species."
diff --git a/html/changelogs/AutoChangeLog-pr-13586.yml b/html/changelogs/AutoChangeLog-pr-13586.yml
deleted file mode 100644
index 5f61b1dc54..0000000000
--- a/html/changelogs/AutoChangeLog-pr-13586.yml
+++ /dev/null
@@ -1,4 +0,0 @@
-author: "KeRSedChaplain"
-delete-after: True
-changes:
- - imageadd: "Resprited the brass claw"
diff --git a/html/changelogs/AutoChangeLog-pr-13587.yml b/html/changelogs/AutoChangeLog-pr-13587.yml
deleted file mode 100644
index ea3f4c5efa..0000000000
--- a/html/changelogs/AutoChangeLog-pr-13587.yml
+++ /dev/null
@@ -1,4 +0,0 @@
-author: "Detective-Google"
-delete-after: True
-changes:
- - tweak: "the snow taxi is no longer the slow taxi"
diff --git a/html/changelogs/AutoChangeLog-pr-13588.yml b/html/changelogs/AutoChangeLog-pr-13588.yml
deleted file mode 100644
index 7ab9d67bab..0000000000
--- a/html/changelogs/AutoChangeLog-pr-13588.yml
+++ /dev/null
@@ -1,5 +0,0 @@
-author: "Delams-The-SM"
-delete-after: True
-changes:
- - rscadd: "Added 3 new emotes *hiss *purr *meow"
- - soundadd: "ported sounds from Citadel RP for *purr and *meow"
diff --git a/html/changelogs/AutoChangeLog-pr-13589.yml b/html/changelogs/AutoChangeLog-pr-13589.yml
deleted file mode 100644
index 877012914e..0000000000
--- a/html/changelogs/AutoChangeLog-pr-13589.yml
+++ /dev/null
@@ -1,4 +0,0 @@
-author: "timothyteakettle"
-delete-after: True
-changes:
- - tweak: "autosurgeons from travelling trader rewards now only have one use"
diff --git a/html/changelogs/AutoChangeLog-pr-13592.yml b/html/changelogs/AutoChangeLog-pr-13592.yml
deleted file mode 100644
index 76e12e8c89..0000000000
--- a/html/changelogs/AutoChangeLog-pr-13592.yml
+++ /dev/null
@@ -1,4 +0,0 @@
-author: "Putnam3145"
-delete-after: True
-changes:
- - rscadd: "Stat panel UI for ranked choice votes"
diff --git a/html/changelogs/AutoChangeLog-pr-13593.yml b/html/changelogs/AutoChangeLog-pr-13593.yml
deleted file mode 100644
index 08310f6013..0000000000
--- a/html/changelogs/AutoChangeLog-pr-13593.yml
+++ /dev/null
@@ -1,4 +0,0 @@
-author: "Putnam3145"
-delete-after: True
-changes:
- - code_imp: "Vote system #defines are now strings"
diff --git a/html/changelogs/AutoChangeLog-pr-13598.yml b/html/changelogs/AutoChangeLog-pr-13598.yml
deleted file mode 100644
index 7bef81fa1a..0000000000
--- a/html/changelogs/AutoChangeLog-pr-13598.yml
+++ /dev/null
@@ -1,4 +0,0 @@
-author: "Arturlang"
-delete-after: True
-changes:
- - bugfix: "Fixes hijack implant APC UI, again"
diff --git a/html/changelogs/AutoChangeLog-pr-13599.yml b/html/changelogs/AutoChangeLog-pr-13599.yml
deleted file mode 100644
index 3deea2b2be..0000000000
--- a/html/changelogs/AutoChangeLog-pr-13599.yml
+++ /dev/null
@@ -1,4 +0,0 @@
-author: "Delams-The-SM"
-delete-after: True
-changes:
- - bugfix: "fixed randomization of colors for things like mulligan and Stabilized green slime extract for matrixed body parts"
diff --git a/html/changelogs/AutoChangeLog-pr-13601.yml b/html/changelogs/AutoChangeLog-pr-13601.yml
deleted file mode 100644
index 0cfb64b48b..0000000000
--- a/html/changelogs/AutoChangeLog-pr-13601.yml
+++ /dev/null
@@ -1,4 +0,0 @@
-author: "timothyteakettle"
-delete-after: True
-changes:
- - tweak: "antag items are now of critical importance and wont fail to be placed on the character"
diff --git a/html/changelogs/AutoChangeLog-pr-13602.yml b/html/changelogs/AutoChangeLog-pr-13602.yml
deleted file mode 100644
index 24185b1792..0000000000
--- a/html/changelogs/AutoChangeLog-pr-13602.yml
+++ /dev/null
@@ -1,5 +0,0 @@
-author: "Putnam3145"
-delete-after: True
-changes:
- - rscadd: "A fallback for dynamic antag rolling that allows for it to just try between traitor, blood brothers, heretics, changeling, bloodsucker and devil until there are enough roundstart antags. This can also happen randomly anyway. Blood brothers and devil are disabled for now, but the code is there to enable them."
- - rscadd: "A new storyteller, \"Grab Bag\", that forces the above round type."
diff --git a/html/changelogs/AutoChangeLog-pr-13603.yml b/html/changelogs/AutoChangeLog-pr-13603.yml
deleted file mode 100644
index 4fcff30da0..0000000000
--- a/html/changelogs/AutoChangeLog-pr-13603.yml
+++ /dev/null
@@ -1,5 +0,0 @@
-author: "kappa-sama"
-delete-after: True
-changes:
- - tweak: "ishotgun crafting recipe no longer requires plasteel and is slightly more convenient"
- - balance: "ishotgun does 45 damage now instead of 40.5"
diff --git a/html/changelogs/AutoChangeLog-pr-13604.yml b/html/changelogs/AutoChangeLog-pr-13604.yml
deleted file mode 100644
index 2ac141215b..0000000000
--- a/html/changelogs/AutoChangeLog-pr-13604.yml
+++ /dev/null
@@ -1,5 +0,0 @@
-author: "Trilbyspaceclone"
-delete-after: True
-changes:
- - balance: "Brass welders are 50% faster at refueling"
- - code_imp: "redoes self fueling welders in the code to be less speggie"
diff --git a/html/changelogs/AutoChangeLog-pr-13605.yml b/html/changelogs/AutoChangeLog-pr-13605.yml
deleted file mode 100644
index 707de17870..0000000000
--- a/html/changelogs/AutoChangeLog-pr-13605.yml
+++ /dev/null
@@ -1,4 +0,0 @@
-author: "Trilbyspaceclone"
-delete-after: True
-changes:
- - rscadd: "the corporate unifoms can now be gotton in the clothing mate vender"
diff --git a/html/changelogs/AutoChangeLog-pr-13606.yml b/html/changelogs/AutoChangeLog-pr-13606.yml
deleted file mode 100644
index 568f8cf7e6..0000000000
--- a/html/changelogs/AutoChangeLog-pr-13606.yml
+++ /dev/null
@@ -1,5 +0,0 @@
-author: "Putnam3145"
-delete-after: True
-changes:
- - bugfix: "adminhelping no longer removes entire admin tab"
- - bugfix: "end of round no longer removes entire admin tab"
diff --git a/html/changelogs/AutoChangeLog-pr-13607.yml b/html/changelogs/AutoChangeLog-pr-13607.yml
deleted file mode 100644
index 0ed47b1d44..0000000000
--- a/html/changelogs/AutoChangeLog-pr-13607.yml
+++ /dev/null
@@ -1,4 +0,0 @@
-author: "timothyteakettle"
-delete-after: True
-changes:
- - rscadd: "polychromic maid outfit"
diff --git a/html/changelogs/AutoChangeLog-pr-13608.yml b/html/changelogs/AutoChangeLog-pr-13608.yml
deleted file mode 100644
index b7c0201cab..0000000000
--- a/html/changelogs/AutoChangeLog-pr-13608.yml
+++ /dev/null
@@ -1,4 +0,0 @@
-author: "SpaceManiac"
-delete-after: True
-changes:
- - bugfix: "Fixed the maphook"
diff --git a/html/changelogs/AutoChangeLog-pr-13610.yml b/html/changelogs/AutoChangeLog-pr-13610.yml
deleted file mode 100644
index a3ca8e6f78..0000000000
--- a/html/changelogs/AutoChangeLog-pr-13610.yml
+++ /dev/null
@@ -1,4 +0,0 @@
-author: "Putnam3145"
-delete-after: True
-changes:
- - bugfix: "atmos subsystem no longer dies if there's too many gases"
diff --git a/html/changelogs/AutoChangeLog-pr-13611.yml b/html/changelogs/AutoChangeLog-pr-13611.yml
deleted file mode 100644
index d7e6e8f9a1..0000000000
--- a/html/changelogs/AutoChangeLog-pr-13611.yml
+++ /dev/null
@@ -1,4 +0,0 @@
-author: "MrJWhit"
-delete-after: True
-changes:
- - rscadd: "Adds a space loop to every map in toxins"
diff --git a/html/changelogs/AutoChangeLog-pr-13612.yml b/html/changelogs/AutoChangeLog-pr-13612.yml
deleted file mode 100644
index 9a67ec5aa3..0000000000
--- a/html/changelogs/AutoChangeLog-pr-13612.yml
+++ /dev/null
@@ -1,4 +0,0 @@
-author: "MrJWhit"
-delete-after: True
-changes:
- - rscadd: "Expanded space hermit base"
diff --git a/html/changelogs/AutoChangeLog-pr-13616.yml b/html/changelogs/AutoChangeLog-pr-13616.yml
deleted file mode 100644
index 3032d0331f..0000000000
--- a/html/changelogs/AutoChangeLog-pr-13616.yml
+++ /dev/null
@@ -1,4 +0,0 @@
-author: "Ghommie"
-delete-after: True
-changes:
- - bugfix: "You can access the mime / clown mask skins radial menu once again."
diff --git a/html/changelogs/AutoChangeLog-pr-13617.yml b/html/changelogs/AutoChangeLog-pr-13617.yml
deleted file mode 100644
index 532882eecc..0000000000
--- a/html/changelogs/AutoChangeLog-pr-13617.yml
+++ /dev/null
@@ -1,4 +0,0 @@
-author: "timothyteakettle"
-delete-after: True
-changes:
- - rscadd: "loadout now has save slot support and colour choosing/saving for polychromic items"
diff --git a/html/changelogs/AutoChangeLog-pr-13618.yml b/html/changelogs/AutoChangeLog-pr-13618.yml
deleted file mode 100644
index b301c39e6b..0000000000
--- a/html/changelogs/AutoChangeLog-pr-13618.yml
+++ /dev/null
@@ -1,5 +0,0 @@
-author: "Vynzill"
-delete-after: True
-changes:
- - rscadd: "new gateway mission
-mapadd: jungleresort map"
diff --git a/html/changelogs/AutoChangeLog-pr-13626.yml b/html/changelogs/AutoChangeLog-pr-13626.yml
deleted file mode 100644
index fa5331e005..0000000000
--- a/html/changelogs/AutoChangeLog-pr-13626.yml
+++ /dev/null
@@ -1,4 +0,0 @@
-author: "zeroisthebiggay"
-delete-after: True
-changes:
- - balance: "MEGAFAUNA DROPS ARE LAVAPROOF"
diff --git a/html/changelogs/AutoChangeLog-pr-13627.yml b/html/changelogs/AutoChangeLog-pr-13627.yml
deleted file mode 100644
index 087cbde3ae..0000000000
--- a/html/changelogs/AutoChangeLog-pr-13627.yml
+++ /dev/null
@@ -1,8 +0,0 @@
-author: "Ghommie"
-delete-after: True
-changes:
- - bugfix: "Dice bags no longer act like cardboard boxes."
- - bugfix: "Abductors should be no longer mute."
- - bugfix: "Item action buttons should now properly show the item current overlays, most times."
- - bugfix: "The blackbox should now go into your hand slot when pried out, rather than tumbling on the ground everytime."
- - tweak: "The Quick Equip hotkey is now usable by all living mobs (so long they have hands and equipment slots)"
diff --git a/html/changelogs/AutoChangeLog-pr-13629.yml b/html/changelogs/AutoChangeLog-pr-13629.yml
deleted file mode 100644
index 954f6972ec..0000000000
--- a/html/changelogs/AutoChangeLog-pr-13629.yml
+++ /dev/null
@@ -1,4 +0,0 @@
-author: "silicons"
-delete-after: True
-changes:
- - rscdel: "anomalies no longer spawn in walls"
diff --git a/html/changelogs/AutoChangeLog-pr-13630.yml b/html/changelogs/AutoChangeLog-pr-13630.yml
deleted file mode 100644
index f7e80aaf9e..0000000000
--- a/html/changelogs/AutoChangeLog-pr-13630.yml
+++ /dev/null
@@ -1,4 +0,0 @@
-author: "timothyteakettle"
-delete-after: True
-changes:
- - rscadd: "you can now customize your size from 90% to 130%, going below 100% makes you have 10 less max health"
diff --git a/html/changelogs/AutoChangeLog-pr-13632.yml b/html/changelogs/AutoChangeLog-pr-13632.yml
deleted file mode 100644
index bf478ec97c..0000000000
--- a/html/changelogs/AutoChangeLog-pr-13632.yml
+++ /dev/null
@@ -1,4 +0,0 @@
-author: "timothyteakettle"
-delete-after: True
-changes:
- - bugfix: "time for memory loss message to show up when being revived is now correctly 300 seconds, instead of 30"
diff --git a/html/changelogs/AutoChangeLog-pr-13633.yml b/html/changelogs/AutoChangeLog-pr-13633.yml
deleted file mode 100644
index d9246cfff6..0000000000
--- a/html/changelogs/AutoChangeLog-pr-13633.yml
+++ /dev/null
@@ -1,4 +0,0 @@
-author: "ArchieBeepBoop"
-delete-after: True
-changes:
- - bugfix: "Outlet Injector Mapping Asset Layer Fix"
diff --git a/html/changelogs/AutoChangeLog-pr-13635.yml b/html/changelogs/AutoChangeLog-pr-13635.yml
deleted file mode 100644
index 21730d4cf5..0000000000
--- a/html/changelogs/AutoChangeLog-pr-13635.yml
+++ /dev/null
@@ -1,4 +0,0 @@
-author: "Hatterhat"
-delete-after: True
-changes:
- - balance: "The bone gauntlets should be slightly less murderously punchy on the fast punches mode."
diff --git a/html/changelogs/AutoChangeLog-pr-13636.yml b/html/changelogs/AutoChangeLog-pr-13636.yml
deleted file mode 100644
index 75124f759f..0000000000
--- a/html/changelogs/AutoChangeLog-pr-13636.yml
+++ /dev/null
@@ -1,4 +0,0 @@
-author: "SiliconMain"
-delete-after: True
-changes:
- - tweak: "Engi department has gas masks in loadout"
diff --git a/html/changelogs/AutoChangeLog-pr-13639.yml b/html/changelogs/AutoChangeLog-pr-13639.yml
deleted file mode 100644
index a511d0a909..0000000000
--- a/html/changelogs/AutoChangeLog-pr-13639.yml
+++ /dev/null
@@ -1,4 +0,0 @@
-author: "Trilbyspaceclone"
-delete-after: True
-changes:
- - tweak: "ASP 9mm and M1911 can now have suppressers added"
diff --git a/html/changelogs/AutoChangeLog-pr-13641.yml b/html/changelogs/AutoChangeLog-pr-13641.yml
deleted file mode 100644
index b0c429da75..0000000000
--- a/html/changelogs/AutoChangeLog-pr-13641.yml
+++ /dev/null
@@ -1,4 +0,0 @@
-author: "MrJWhit"
-delete-after: True
-changes:
- - balance: "Nerf combat knife damage"
diff --git a/html/changelogs/AutoChangeLog-pr-13644.yml b/html/changelogs/AutoChangeLog-pr-13644.yml
deleted file mode 100644
index 71417788a7..0000000000
--- a/html/changelogs/AutoChangeLog-pr-13644.yml
+++ /dev/null
@@ -1,8 +0,0 @@
-author: "DeltaFire15"
-delete-after: True
-changes:
- - balance: "Biomechanical (hybrid) bodyparts now have access to wound-fixing surgeries."
- - tweak: "A wound being fixed no longer just qdel()s surgeries connected to it."
- - tweak: "Some robotic surgery steps are now a bit more clear."
- - bugfix: "Organs no longer get fed to people after successfully being inserted into them."
- - tweak: "Not completing the do_after of a surgery no longer causes you to attack the target with whatever you were holding."
diff --git a/html/changelogs/AutoChangeLog-pr-13647.yml b/html/changelogs/AutoChangeLog-pr-13647.yml
deleted file mode 100644
index b3211ee759..0000000000
--- a/html/changelogs/AutoChangeLog-pr-13647.yml
+++ /dev/null
@@ -1,4 +0,0 @@
-author: "zeroisthebiggay"
-delete-after: True
-changes:
- - bugfix: "jacqueline spawns on boxstation"
diff --git a/html/changelogs/AutoChangeLog-pr-13648.yml b/html/changelogs/AutoChangeLog-pr-13648.yml
deleted file mode 100644
index 4148230385..0000000000
--- a/html/changelogs/AutoChangeLog-pr-13648.yml
+++ /dev/null
@@ -1,13 +0,0 @@
-author: "DeltaFire15"
-delete-after: True
-changes:
- - bugfix: "The 'Your body is in a cloner' notification works again"
- - bugfix: "Hijack implants should work properly again (or, at least better)"
- - bugfix: "Liches are now good skeletons again instead of weak ones"
- - bugfix: "The piratepad control cannot be destroyed again."
- - bugfix: "Pirates have received new supplies of jetpacks instead of useless oxygen tanks"
- - bugfix: "Ratvarian AIs are once again able to show their linked borgs Ratvar's light"
- - bugfix: "Hijackers are once again unable to detonate borgs without being adjacent to the console"
- - bugfix: "Automated annoucement systems and gulag ore consoles no longer waste emag charges"
- - bugfix: "Automated announcement systems once again can be remote controlled by non-AIs with silicon access"
- - bugfix: "APCs being hijacked multiple times at once is no longer possible, preventing some issues"
diff --git a/html/changelogs/AutoChangeLog-pr-13653.yml b/html/changelogs/AutoChangeLog-pr-13653.yml
deleted file mode 100644
index 2f920da353..0000000000
--- a/html/changelogs/AutoChangeLog-pr-13653.yml
+++ /dev/null
@@ -1,4 +0,0 @@
-author: "MrJWhit"
-delete-after: True
-changes:
- - tweak: "Minor fixes to kilo"
diff --git a/html/changelogs/AutoChangeLog-pr-13654.yml b/html/changelogs/AutoChangeLog-pr-13654.yml
deleted file mode 100644
index cb67c6e6be..0000000000
--- a/html/changelogs/AutoChangeLog-pr-13654.yml
+++ /dev/null
@@ -1,4 +0,0 @@
-author: "ArchieBeepBoop"
-delete-after: True
-changes:
- - bugfix: "Jacqueen and the Christmas tree should no longer spawn abstract things that can cause shittons of runtimes."
diff --git a/html/changelogs/AutoChangeLog-pr-13655.yml b/html/changelogs/AutoChangeLog-pr-13655.yml
deleted file mode 100644
index 6e48c84054..0000000000
--- a/html/changelogs/AutoChangeLog-pr-13655.yml
+++ /dev/null
@@ -1,4 +0,0 @@
-author: "timothyteakettle"
-delete-after: True
-changes:
- - bugfix: "fixes held items proccing crossed when passing someone"
diff --git a/html/changelogs/AutoChangeLog-pr-13656.yml b/html/changelogs/AutoChangeLog-pr-13656.yml
deleted file mode 100644
index 017f0d99c2..0000000000
--- a/html/changelogs/AutoChangeLog-pr-13656.yml
+++ /dev/null
@@ -1,4 +0,0 @@
-author: "MrJWhit"
-delete-after: True
-changes:
- - admin: "Canceling events gives more time to stop from 10 to 30"
diff --git a/html/changelogs/AutoChangeLog-pr-13657.yml b/html/changelogs/AutoChangeLog-pr-13657.yml
deleted file mode 100644
index 6f445f6b71..0000000000
--- a/html/changelogs/AutoChangeLog-pr-13657.yml
+++ /dev/null
@@ -1,4 +0,0 @@
-author: "DeltaFire15"
-delete-after: True
-changes:
- - bugfix: "The transmission sigil power drain works now"
diff --git a/html/changelogs/AutoChangeLog-pr-13658.yml b/html/changelogs/AutoChangeLog-pr-13658.yml
deleted file mode 100644
index 09b22d38ad..0000000000
--- a/html/changelogs/AutoChangeLog-pr-13658.yml
+++ /dev/null
@@ -1,6 +0,0 @@
-author: "DeltaFire15"
-delete-after: True
-changes:
- - bugfix: "Scripture no longer sometimes eats part of its invocation."
- - balance: "APCs and silicons are now more susceptible to powerdrains (by the power_drain() proc, which is rare)"
- - balance: "Void Volt has been modified from a chant to a singular pulse."
diff --git a/html/changelogs/AutoChangeLog-pr-13659.yml b/html/changelogs/AutoChangeLog-pr-13659.yml
deleted file mode 100644
index 85eee3b78d..0000000000
--- a/html/changelogs/AutoChangeLog-pr-13659.yml
+++ /dev/null
@@ -1,4 +0,0 @@
-author: "timothyteakettle"
-delete-after: True
-changes:
- - bugfix: "the load away mission verb won't crash the server now"
diff --git a/html/changelogs/AutoChangeLog-pr-13661.yml b/html/changelogs/AutoChangeLog-pr-13661.yml
deleted file mode 100644
index 81b5a735dc..0000000000
--- a/html/changelogs/AutoChangeLog-pr-13661.yml
+++ /dev/null
@@ -1,4 +0,0 @@
-author: "timothyteakettle"
-delete-after: True
-changes:
- - rscadd: "added in-game age verification as an alternative to access requests"
diff --git a/html/changelogs/AutoChangeLog-pr-13662.yml b/html/changelogs/AutoChangeLog-pr-13662.yml
deleted file mode 100644
index 6ac16937d8..0000000000
--- a/html/changelogs/AutoChangeLog-pr-13662.yml
+++ /dev/null
@@ -1,4 +0,0 @@
-author: "silicons"
-delete-after: True
-changes:
- - rscadd: "you can now be an angel using a magic mirror again"
diff --git a/html/changelogs/AutoChangeLog-pr-13669.yml b/html/changelogs/AutoChangeLog-pr-13669.yml
deleted file mode 100644
index c682500501..0000000000
--- a/html/changelogs/AutoChangeLog-pr-13669.yml
+++ /dev/null
@@ -1,4 +0,0 @@
-author: "Arturlang"
-delete-after: True
-changes:
- - tweak: "Being sacrificed by the cult no longer removes all hope of rescue."
diff --git a/html/changelogs/AutoChangeLog-pr-13670.yml b/html/changelogs/AutoChangeLog-pr-13670.yml
deleted file mode 100644
index 594e459d5a..0000000000
--- a/html/changelogs/AutoChangeLog-pr-13670.yml
+++ /dev/null
@@ -1,4 +0,0 @@
-author: "shellspeed1"
-delete-after: True
-changes:
- - tweak: "Floor bots are now buildable with all toolboxes."
diff --git a/html/changelogs/AutoChangeLog-pr-13671.yml b/html/changelogs/AutoChangeLog-pr-13671.yml
deleted file mode 100644
index 855028d9ed..0000000000
--- a/html/changelogs/AutoChangeLog-pr-13671.yml
+++ /dev/null
@@ -1,4 +0,0 @@
-author: "DeltaFire15"
-delete-after: True
-changes:
- - code_imp: "Clockwork rites now support hiding specific rites from neutered servants."
diff --git a/html/changelogs/AutoChangeLog-pr-13673.yml b/html/changelogs/AutoChangeLog-pr-13673.yml
deleted file mode 100644
index 40b45d80f4..0000000000
--- a/html/changelogs/AutoChangeLog-pr-13673.yml
+++ /dev/null
@@ -1,4 +0,0 @@
-author: "Arturlang"
-delete-after: True
-changes:
- - bugfix: "Makes construct mind returning more robust"
diff --git a/html/changelogs/AutoChangeLog-pr-13674.yml b/html/changelogs/AutoChangeLog-pr-13674.yml
deleted file mode 100644
index ccbd96aeb4..0000000000
--- a/html/changelogs/AutoChangeLog-pr-13674.yml
+++ /dev/null
@@ -1,4 +0,0 @@
-author: "DeltaFire15"
-delete-after: True
-changes:
- - bugfix: "The borg VTEC ability now actually gets removed when the upgrade is removed."
diff --git a/html/changelogs/AutoChangeLog-pr-13675.yml b/html/changelogs/AutoChangeLog-pr-13675.yml
deleted file mode 100644
index d46d4490d3..0000000000
--- a/html/changelogs/AutoChangeLog-pr-13675.yml
+++ /dev/null
@@ -1,4 +0,0 @@
-author: "DeltaFire15"
-delete-after: True
-changes:
- - bugfix: "Sleeper UI interactiveness now behaves correctly."
diff --git a/html/changelogs/AutoChangeLog-pr-13676.yml b/html/changelogs/AutoChangeLog-pr-13676.yml
deleted file mode 100644
index d584af38dc..0000000000
--- a/html/changelogs/AutoChangeLog-pr-13676.yml
+++ /dev/null
@@ -1,4 +0,0 @@
-author: "DeltaFire15"
-delete-after: True
-changes:
- - bugfix: "Fixes a minor incorrectness in ratvarian borg slabs (ratvar_act -> ui_act)"
diff --git a/html/changelogs/AutoChangeLog-pr-13678.yml b/html/changelogs/AutoChangeLog-pr-13678.yml
deleted file mode 100644
index 261ecc3475..0000000000
--- a/html/changelogs/AutoChangeLog-pr-13678.yml
+++ /dev/null
@@ -1,4 +0,0 @@
-author: "Arturlang"
-delete-after: True
-changes:
- - code_imp: "Comments out spaceman dmm do not sleeps for mob/proc/CommonClickOn, atom/proc/attack_hand, datum/proc/keyLoop and mob/living/proc/Life"
diff --git a/html/changelogs/AutoChangeLog-pr-13679.yml b/html/changelogs/AutoChangeLog-pr-13679.yml
deleted file mode 100644
index 37b9d287b0..0000000000
--- a/html/changelogs/AutoChangeLog-pr-13679.yml
+++ /dev/null
@@ -1,4 +0,0 @@
-author: "DeltaFire15"
-delete-after: True
-changes:
- - rscadd: "Robots (anyone with the robotic_organism trait) have toxins damage replaced with system corruption. See the PR for details."
diff --git a/html/changelogs/AutoChangeLog-pr-13680.yml b/html/changelogs/AutoChangeLog-pr-13680.yml
deleted file mode 100644
index a1e58ac3a5..0000000000
--- a/html/changelogs/AutoChangeLog-pr-13680.yml
+++ /dev/null
@@ -1,4 +0,0 @@
-author: "DeltaFire15"
-delete-after: True
-changes:
- - bugfix: "A runtime caused by hallucinations is gone."
diff --git a/html/changelogs/AutoChangeLog-pr-13681.yml b/html/changelogs/AutoChangeLog-pr-13681.yml
deleted file mode 100644
index c51a7b51b0..0000000000
--- a/html/changelogs/AutoChangeLog-pr-13681.yml
+++ /dev/null
@@ -1,4 +0,0 @@
-author: "DeltaFire15"
-delete-after: True
-changes:
- - bugfix: "Supplypods shouldn't cause runtimes anymore, and shrapnel (pelletclouds) should work for them."
diff --git a/html/changelogs/AutoChangeLog-pr-13682.yml b/html/changelogs/AutoChangeLog-pr-13682.yml
deleted file mode 100644
index e5fececf4e..0000000000
--- a/html/changelogs/AutoChangeLog-pr-13682.yml
+++ /dev/null
@@ -1,7 +0,0 @@
-author: "EmeraldSundisk"
-delete-after: True
-changes:
- - bugfix: "Changes the area designations to be not varedited since the code didn't like that anymore"
- - bugfix: "The cargo bay conveyor belts not only work with the shuttle now but go in the right direction to boot"
- - tweak: "Slight visual adjustments to cargo in light of this"
- - rscadd: "The arcade's got RAD carpet now"
diff --git a/html/changelogs/AutoChangeLog-pr-13683.yml b/html/changelogs/AutoChangeLog-pr-13683.yml
deleted file mode 100644
index da7ecab5c6..0000000000
--- a/html/changelogs/AutoChangeLog-pr-13683.yml
+++ /dev/null
@@ -1,4 +0,0 @@
-author: "SandPoot"
-delete-after: True
-changes:
- - code_imp: "Swaps the gift static blacklist with a global list one."
diff --git a/html/changelogs/AutoChangeLog-pr-13685.yml b/html/changelogs/AutoChangeLog-pr-13685.yml
deleted file mode 100644
index 10d53c9065..0000000000
--- a/html/changelogs/AutoChangeLog-pr-13685.yml
+++ /dev/null
@@ -1,6 +0,0 @@
-author: "uomo91"
-delete-after: True
-changes:
- - bugfix: "Fixed \"Show All\" tab in player panel logs being broken."
- - bugfix: "Whispers, OOC, and various other things display differently in logs, visually distinguishing them from say logs."
- - refactor: "Player panel logs will now show all logs chronologically, so you'll see commingled say and attack logs if you're on the \"Show All\" tab, etc..."
diff --git a/html/changelogs/AutoChangeLog-pr-13686.yml b/html/changelogs/AutoChangeLog-pr-13686.yml
deleted file mode 100644
index 72f9a2bd54..0000000000
--- a/html/changelogs/AutoChangeLog-pr-13686.yml
+++ /dev/null
@@ -1,4 +0,0 @@
-author: "Arturlang"
-delete-after: True
-changes:
- - bugfix: "Hopefully fixes whitescreen issues for TGUI UI's by giving assets more time to get to the client"
diff --git a/html/changelogs/AutoChangeLog-pr-13687.yml b/html/changelogs/AutoChangeLog-pr-13687.yml
deleted file mode 100644
index e2baddbd2a..0000000000
--- a/html/changelogs/AutoChangeLog-pr-13687.yml
+++ /dev/null
@@ -1,4 +0,0 @@
-author: "silicons"
-delete-after: True
-changes:
- - rscadd: "tailed individuals can now target groin to intertwine tails on grab intent."
diff --git a/html/changelogs/AutoChangeLog-pr-13688.yml b/html/changelogs/AutoChangeLog-pr-13688.yml
deleted file mode 100644
index 4013705549..0000000000
--- a/html/changelogs/AutoChangeLog-pr-13688.yml
+++ /dev/null
@@ -1,4 +0,0 @@
-author: "DeltaFire15"
-delete-after: True
-changes:
- - bugfix: "Repeatable surgery steps can no longer cause an infinite loop if not completing the do_after"
diff --git a/html/changelogs/AutoChangeLog-pr-13689.yml b/html/changelogs/AutoChangeLog-pr-13689.yml
deleted file mode 100644
index eb476895e7..0000000000
--- a/html/changelogs/AutoChangeLog-pr-13689.yml
+++ /dev/null
@@ -1,5 +0,0 @@
-author: "DeltaFire15"
-delete-after: True
-changes:
- - bugfix: "Recharging APCs no longer use 0.2% of the power they should be using."
- - bugfix: "APCs no longer always use as much power as they can for their cell, even if it is full."
diff --git a/html/changelogs/AutoChangeLog-pr-13694.yml b/html/changelogs/AutoChangeLog-pr-13694.yml
deleted file mode 100644
index 75a4bbb549..0000000000
--- a/html/changelogs/AutoChangeLog-pr-13694.yml
+++ /dev/null
@@ -1,5 +0,0 @@
-author: "Acer202, with minor help from The0bserver"
-delete-after: True
-changes:
- - rscadd: "After internal deliberation, CentCom has decided to run a limited reinstatement of public mining shuttles for use in more tried and true station classes. CentCom would like to remind you that this privilege is easily revoked, and that abuse may result in immediate detonation."
- - rscadd: "Restores the mining shuttle on Pubby, Box, Delta, Meta, and Lambda Station."
diff --git a/html/changelogs/AutoChangeLog-pr-13695.yml b/html/changelogs/AutoChangeLog-pr-13695.yml
deleted file mode 100644
index 551d1f4df5..0000000000
--- a/html/changelogs/AutoChangeLog-pr-13695.yml
+++ /dev/null
@@ -1,4 +0,0 @@
-author: "shellspeed1"
-delete-after: True
-changes:
- - balance: "Lings now have infinite space for DNA."
diff --git a/html/changelogs/AutoChangeLog-pr-13697.yml b/html/changelogs/AutoChangeLog-pr-13697.yml
deleted file mode 100644
index 329a621c48..0000000000
--- a/html/changelogs/AutoChangeLog-pr-13697.yml
+++ /dev/null
@@ -1,4 +0,0 @@
-author: "Putnam3145"
-delete-after: True
-changes:
- - balance: "Spontaneous brain trauma now requires minimum 5 players"
diff --git a/html/changelogs/AutoChangeLog-pr-13698.yml b/html/changelogs/AutoChangeLog-pr-13698.yml
deleted file mode 100644
index 10072ba948..0000000000
--- a/html/changelogs/AutoChangeLog-pr-13698.yml
+++ /dev/null
@@ -1,4 +0,0 @@
-author: "timothyteakettle"
-delete-after: True
-changes:
- - rscadd: "you can rebind communication hotkeys and they're the default now"
diff --git a/html/changelogs/AutoChangeLog-pr-13699.yml b/html/changelogs/AutoChangeLog-pr-13699.yml
deleted file mode 100644
index 5b2234224e..0000000000
--- a/html/changelogs/AutoChangeLog-pr-13699.yml
+++ /dev/null
@@ -1,5 +0,0 @@
-author: "silicons"
-delete-after: True
-changes:
- - tweak: "nanite resistances tweaked"
- - rscadd: "new nanite programs added for locking the user out from being modified by consoles or antivirals."
diff --git a/html/changelogs/AutoChangeLog-pr-13702.yml b/html/changelogs/AutoChangeLog-pr-13702.yml
deleted file mode 100644
index 24f79c7cda..0000000000
--- a/html/changelogs/AutoChangeLog-pr-13702.yml
+++ /dev/null
@@ -1,4 +0,0 @@
-author: "Putnam3145"
-delete-after: True
-changes:
- - tweak: "gear harness no longer magically covers up the body mechanically despite covering up nothing visually"
diff --git a/html/changelogs/AutoChangeLog-pr-13703.yml b/html/changelogs/AutoChangeLog-pr-13703.yml
deleted file mode 100644
index fd3ba2198f..0000000000
--- a/html/changelogs/AutoChangeLog-pr-13703.yml
+++ /dev/null
@@ -1,4 +0,0 @@
-author: "Putnam3145"
-delete-after: True
-changes:
- - bugfix: "Dynamic vote no longer shows the none-storyteller."
diff --git a/html/changelogs/AutoChangeLog-pr-13704.yml b/html/changelogs/AutoChangeLog-pr-13704.yml
deleted file mode 100644
index 0ef8ca4a1d..0000000000
--- a/html/changelogs/AutoChangeLog-pr-13704.yml
+++ /dev/null
@@ -1,4 +0,0 @@
-author: "Putnam3145"
-delete-after: True
-changes:
- - bugfix: "Emotes can properly be filtered for in TGUI."
diff --git a/html/changelogs/AutoChangeLog-pr-13705.yml b/html/changelogs/AutoChangeLog-pr-13705.yml
deleted file mode 100644
index c1b366aeb7..0000000000
--- a/html/changelogs/AutoChangeLog-pr-13705.yml
+++ /dev/null
@@ -1,6 +0,0 @@
-author: "Putnam3145"
-delete-after: True
-changes:
- - balance: "Rad collectors now get 1.25x as much energy from radiation"
- - balance: "Rad collectors now put out 1.25x as much stored energy per tick"
- - balance: "Above two rad collector changes give a total 56.25% power output increase"
diff --git a/html/changelogs/AutoChangeLog-pr-13707.yml b/html/changelogs/AutoChangeLog-pr-13707.yml
deleted file mode 100644
index a7dd977cca..0000000000
--- a/html/changelogs/AutoChangeLog-pr-13707.yml
+++ /dev/null
@@ -1,5 +0,0 @@
-author: "DeltaFire15"
-delete-after: True
-changes:
- - balance: "Robotpeople are now fully immune to the effects of alcohol (drunkness etc.)"
- - tweak: "Renames the alcohol intolerance trait in the code to make what it does more clear."
diff --git a/html/changelogs/AutoChangeLog-pr-13711.yml b/html/changelogs/AutoChangeLog-pr-13711.yml
deleted file mode 100644
index e6fde23e8c..0000000000
--- a/html/changelogs/AutoChangeLog-pr-13711.yml
+++ /dev/null
@@ -1,5 +0,0 @@
-author: "DeltaFire15"
-delete-after: True
-changes:
- - tweak: "Medibots now ignore people they cannot help due to their biology."
- - bugfix: "get_damaged_bodyparts() is no longer broken."
diff --git a/html/changelogs/AutoChangeLog-pr-13713.yml b/html/changelogs/AutoChangeLog-pr-13713.yml
deleted file mode 100644
index 36228f10c5..0000000000
--- a/html/changelogs/AutoChangeLog-pr-13713.yml
+++ /dev/null
@@ -1,4 +0,0 @@
-author: "timothyteakettle"
-delete-after: True
-changes:
- - rscadd: "all gas masks (but welding + glass) can be alt clicked to show/hide identity"
diff --git a/html/changelogs/AutoChangeLog-pr-13715.yml b/html/changelogs/AutoChangeLog-pr-13715.yml
deleted file mode 100644
index 70b22a9bc9..0000000000
--- a/html/changelogs/AutoChangeLog-pr-13715.yml
+++ /dev/null
@@ -1,4 +0,0 @@
-author: "MrJWhit"
-delete-after: True
-changes:
- - tweak: "Removes an opposum from the wall"
diff --git a/html/changelogs/AutoChangeLog-pr-13717.yml b/html/changelogs/AutoChangeLog-pr-13717.yml
deleted file mode 100644
index 268730c58e..0000000000
--- a/html/changelogs/AutoChangeLog-pr-13717.yml
+++ /dev/null
@@ -1,4 +0,0 @@
-author: "Acer202"
-delete-after: True
-changes:
- - bugfix: "Main mining shuttle should no longer look at the public mining shuttle and attempt to dock ontop of it. Monastery shuttle should now function again."
diff --git a/html/changelogs/AutoChangeLog-pr-13719.yml b/html/changelogs/AutoChangeLog-pr-13719.yml
deleted file mode 100644
index c676072a35..0000000000
--- a/html/changelogs/AutoChangeLog-pr-13719.yml
+++ /dev/null
@@ -1,6 +0,0 @@
-author: "shellspeed1"
-delete-after: True
-changes:
- - rscadd: "Construction bags have been added, use them to carry all sorts of construction bits."
- - rscadd: "A recipe has been added to cloth stacks to make material and construction bags."
- - balance: "Material bags and construction bags are now available in engineering lockers."
diff --git a/html/changelogs/AutoChangeLog-pr-13721.yml b/html/changelogs/AutoChangeLog-pr-13721.yml
deleted file mode 100644
index 44b3c7283c..0000000000
--- a/html/changelogs/AutoChangeLog-pr-13721.yml
+++ /dev/null
@@ -1,4 +0,0 @@
-author: "MrJWhit"
-delete-after: True
-changes:
- - tweak: "Increased christmas event from 22th to 27th to 10th to 27th"
diff --git a/html/changelogs/AutoChangeLog-pr-13725.yml b/html/changelogs/AutoChangeLog-pr-13725.yml
deleted file mode 100644
index 5105de865e..0000000000
--- a/html/changelogs/AutoChangeLog-pr-13725.yml
+++ /dev/null
@@ -1,4 +0,0 @@
-author: "silicons"
-delete-after: True
-changes:
- - bugfix: "keybinds generate anti-collision bindings where necessary automatically now"
diff --git a/html/changelogs/AutoChangeLog-pr-13733.yml b/html/changelogs/AutoChangeLog-pr-13733.yml
deleted file mode 100644
index a10719fdc6..0000000000
--- a/html/changelogs/AutoChangeLog-pr-13733.yml
+++ /dev/null
@@ -1,4 +0,0 @@
-author: "DeltaFire15"
-delete-after: True
-changes:
- - bugfix: "Fixes the tail entwine messages displaying incorrectly."
diff --git a/html/changelogs/AutoChangeLog-pr-13734.yml b/html/changelogs/AutoChangeLog-pr-13734.yml
deleted file mode 100644
index a4ea9fdfac..0000000000
--- a/html/changelogs/AutoChangeLog-pr-13734.yml
+++ /dev/null
@@ -1,4 +0,0 @@
-author: "keronshb"
-delete-after: True
-changes:
- - bugfix: "Fixes Reflective Blobs"
diff --git a/html/changelogs/AutoChangeLog-pr-13736.yml b/html/changelogs/AutoChangeLog-pr-13736.yml
deleted file mode 100644
index dfa5e7cb66..0000000000
--- a/html/changelogs/AutoChangeLog-pr-13736.yml
+++ /dev/null
@@ -1,4 +0,0 @@
-author: "DeltaFire15"
-delete-after: True
-changes:
- - tweak: "Abductors now can use experimental organ replacement surgery on robots / synthetics."
diff --git a/html/changelogs/AutoChangeLog-pr-13737.yml b/html/changelogs/AutoChangeLog-pr-13737.yml
deleted file mode 100644
index 6c1121256f..0000000000
--- a/html/changelogs/AutoChangeLog-pr-13737.yml
+++ /dev/null
@@ -1,4 +0,0 @@
-author: "qwertyquerty"
-delete-after: True
-changes:
- - bugfix: "Flash the screen on climax"
diff --git a/html/changelogs/AutoChangeLog-pr-13738.yml b/html/changelogs/AutoChangeLog-pr-13738.yml
deleted file mode 100644
index f34f9d505a..0000000000
--- a/html/changelogs/AutoChangeLog-pr-13738.yml
+++ /dev/null
@@ -1,4 +0,0 @@
-author: "EdgeLordExe, MoonFalcon"
-delete-after: True
-changes:
- - balance: "Ported a bunch of heretic-related tweaks and changes from tg"
diff --git a/html/changelogs/AutoChangeLog-pr-13739.yml b/html/changelogs/AutoChangeLog-pr-13739.yml
deleted file mode 100644
index 6db29bf922..0000000000
--- a/html/changelogs/AutoChangeLog-pr-13739.yml
+++ /dev/null
@@ -1,4 +0,0 @@
-author: "timothyteakettle"
-delete-after: True
-changes:
- - bugfix: "custom eyes and tongues now properly carry across cloning"
diff --git a/html/changelogs/AutoChangeLog-pr-13740.yml b/html/changelogs/AutoChangeLog-pr-13740.yml
deleted file mode 100644
index 2bbd9b877a..0000000000
--- a/html/changelogs/AutoChangeLog-pr-13740.yml
+++ /dev/null
@@ -1,4 +0,0 @@
-author: "Linzolle"
-delete-after: True
-changes:
- - bugfix: "lizard snouts are no longer *slightly* lighter than they are supposed to be."
diff --git a/html/changelogs/AutoChangeLog-pr-13741.yml b/html/changelogs/AutoChangeLog-pr-13741.yml
deleted file mode 100644
index c49015ab28..0000000000
--- a/html/changelogs/AutoChangeLog-pr-13741.yml
+++ /dev/null
@@ -1,4 +0,0 @@
-author: "DeltaFire15"
-delete-after: True
-changes:
- - bugfix: "Objectives are no longer very broken."
diff --git a/html/changelogs/AutoChangeLog-pr-13743.yml b/html/changelogs/AutoChangeLog-pr-13743.yml
deleted file mode 100644
index 00ff1a55bd..0000000000
--- a/html/changelogs/AutoChangeLog-pr-13743.yml
+++ /dev/null
@@ -1,5 +0,0 @@
-author: "Linzolle"
-delete-after: True
-changes:
- - bugfix: "entertainment monitors no longer invisible"
- - rscadd: "entertainment monitors now light up and display text when motion is detected in thunderdome"
diff --git a/html/changelogs/AutoChangeLog-pr-13745.yml b/html/changelogs/AutoChangeLog-pr-13745.yml
deleted file mode 100644
index af6cb787b6..0000000000
--- a/html/changelogs/AutoChangeLog-pr-13745.yml
+++ /dev/null
@@ -1,4 +0,0 @@
-author: "Arturlang"
-delete-after: True
-changes:
- - bugfix: "Handles more edge cases with construct soul returning"
diff --git a/html/changelogs/AutoChangeLog-pr-13746.yml b/html/changelogs/AutoChangeLog-pr-13746.yml
deleted file mode 100644
index 73c7ab4058..0000000000
--- a/html/changelogs/AutoChangeLog-pr-13746.yml
+++ /dev/null
@@ -1,5 +0,0 @@
-author: "keronshb"
-delete-after: True
-changes:
- - rscadd: "Adds more room to northwest maint"
- - rscadd: "Adds a bridge between Atmos and the Turbine."
diff --git a/html/changelogs/AutoChangeLog-pr-13747.yml b/html/changelogs/AutoChangeLog-pr-13747.yml
deleted file mode 100644
index f8b6111c08..0000000000
--- a/html/changelogs/AutoChangeLog-pr-13747.yml
+++ /dev/null
@@ -1,6 +0,0 @@
-author: "MrJWhit"
-delete-after: True
-changes:
- - rscadd: ""
- - tweak: "Added the ability for cargo to buy a large welding tank"
- - imageadd: "Tweaked large tank reagent sprites to /tg/'s"
diff --git a/html/changelogs/AutoChangeLog-pr-13750.yml b/html/changelogs/AutoChangeLog-pr-13750.yml
deleted file mode 100644
index a89abdd440..0000000000
--- a/html/changelogs/AutoChangeLog-pr-13750.yml
+++ /dev/null
@@ -1,6 +0,0 @@
-author: "EmeraldSundisk"
-delete-after: True
-changes:
- - bugfix: "Fixes the conveyor belt issues in Delta Station's cargo wing"
- - rscdel: "Removes some of the dirt around the affected area (presumably they would have cleaned it up while working on it)"
- - rscadd: "Adds a floor light to fix the \"dark spot\" cargo had"
diff --git a/html/changelogs/AutoChangeLog-pr-13751.yml b/html/changelogs/AutoChangeLog-pr-13751.yml
deleted file mode 100644
index 2d8c964a14..0000000000
--- a/html/changelogs/AutoChangeLog-pr-13751.yml
+++ /dev/null
@@ -1,4 +0,0 @@
-author: "silicons"
-delete-after: True
-changes:
- - tweak: "text formatting now uses one character instead of two around the text to emphasize."
diff --git a/html/changelogs/AutoChangeLog-pr-13752.yml b/html/changelogs/AutoChangeLog-pr-13752.yml
deleted file mode 100644
index 2175ed469b..0000000000
--- a/html/changelogs/AutoChangeLog-pr-13752.yml
+++ /dev/null
@@ -1,4 +0,0 @@
-author: "silicons"
-delete-after: True
-changes:
- - balance: "stamina crit is only removed when at or under 100 stamina, rather than 140. stamina crit threshold is still at 140."
diff --git a/html/changelogs/AutoChangeLog-pr-13753.yml b/html/changelogs/AutoChangeLog-pr-13753.yml
deleted file mode 100644
index e752df79a0..0000000000
--- a/html/changelogs/AutoChangeLog-pr-13753.yml
+++ /dev/null
@@ -1,4 +0,0 @@
-author: "silicons"
-delete-after: True
-changes:
- - balance: "shoving yourself up now costs 50% more"
diff --git a/html/changelogs/AutoChangeLog-pr-13755.yml b/html/changelogs/AutoChangeLog-pr-13755.yml
deleted file mode 100644
index e50cd0199f..0000000000
--- a/html/changelogs/AutoChangeLog-pr-13755.yml
+++ /dev/null
@@ -1,4 +0,0 @@
-author: "silicons"
-delete-after: True
-changes:
- - rscadd: "colormates"
diff --git a/html/changelogs/AutoChangeLog-pr-13757.yml b/html/changelogs/AutoChangeLog-pr-13757.yml
deleted file mode 100644
index a36e67943e..0000000000
--- a/html/changelogs/AutoChangeLog-pr-13757.yml
+++ /dev/null
@@ -1,4 +0,0 @@
-author: "timothyteakettle"
-delete-after: True
-changes:
- - rscadd: "improvements to the automatic age gate"
diff --git a/html/changelogs/AutoChangeLog-pr-13758.yml b/html/changelogs/AutoChangeLog-pr-13758.yml
deleted file mode 100644
index fc4adc1614..0000000000
--- a/html/changelogs/AutoChangeLog-pr-13758.yml
+++ /dev/null
@@ -1,5 +0,0 @@
-author: "timothyteakettle"
-delete-after: True
-changes:
- - tweak: "custom holoforms are now accessible through an action instead of through verbs"
- - tweak: "AI holoforms can now emote"
diff --git a/html/changelogs/AutoChangeLog-pr-13761.yml b/html/changelogs/AutoChangeLog-pr-13761.yml
deleted file mode 100644
index c8ab365fe3..0000000000
--- a/html/changelogs/AutoChangeLog-pr-13761.yml
+++ /dev/null
@@ -1,4 +0,0 @@
-author: "silicons"
-delete-after: True
-changes:
- - balance: "dna melt drops all items being destroying you"
diff --git a/html/changelogs/AutoChangeLog-pr-13762.yml b/html/changelogs/AutoChangeLog-pr-13762.yml
deleted file mode 100644
index 841e4d91c0..0000000000
--- a/html/changelogs/AutoChangeLog-pr-13762.yml
+++ /dev/null
@@ -1,4 +0,0 @@
-author: "silicons"
-delete-after: True
-changes:
- - tweak: "luxury shuttle no longer has noteleport"
diff --git a/html/changelogs/AutoChangeLog-pr-13763.yml b/html/changelogs/AutoChangeLog-pr-13763.yml
deleted file mode 100644
index 68eeaf1022..0000000000
--- a/html/changelogs/AutoChangeLog-pr-13763.yml
+++ /dev/null
@@ -1,4 +0,0 @@
-author: "Hatterhat"
-delete-after: True
-changes:
- - tweak: "RPEDs now drop their lowest part tier first when quick-emptied (used inhand)."
diff --git a/html/changelogs/AutoChangeLog-pr-13764.yml b/html/changelogs/AutoChangeLog-pr-13764.yml
deleted file mode 100644
index 514705fd78..0000000000
--- a/html/changelogs/AutoChangeLog-pr-13764.yml
+++ /dev/null
@@ -1,4 +0,0 @@
-author: "Hatterhat"
-delete-after: True
-changes:
- - tweak: "Exosuits sold on the Supply shuttle no longer leave wreckages."
diff --git a/html/changelogs/AutoChangeLog-pr-13765.yml b/html/changelogs/AutoChangeLog-pr-13765.yml
deleted file mode 100644
index 7ca1695d0f..0000000000
--- a/html/changelogs/AutoChangeLog-pr-13765.yml
+++ /dev/null
@@ -1,4 +0,0 @@
-author: "MrJWhit"
-delete-after: True
-changes:
- - tweak: "Updated jukebox sprite."
diff --git a/html/changelogs/AutoChangeLog-pr-13766.yml b/html/changelogs/AutoChangeLog-pr-13766.yml
deleted file mode 100644
index 8ba317afed..0000000000
--- a/html/changelogs/AutoChangeLog-pr-13766.yml
+++ /dev/null
@@ -1,4 +0,0 @@
-author: "MrJWhit"
-delete-after: True
-changes:
- - tweak: "Updates our dark gygax sprites to /tg/'s"
diff --git a/html/changelogs/AutoChangeLog-pr-13767.yml b/html/changelogs/AutoChangeLog-pr-13767.yml
deleted file mode 100644
index 2d38af77e3..0000000000
--- a/html/changelogs/AutoChangeLog-pr-13767.yml
+++ /dev/null
@@ -1,4 +0,0 @@
-author: "MrJWhit"
-delete-after: True
-changes:
- - tweak: "Updated meat icons"
diff --git a/html/changelogs/AutoChangeLog-pr-13769.yml b/html/changelogs/AutoChangeLog-pr-13769.yml
deleted file mode 100644
index 04d1cbc11c..0000000000
--- a/html/changelogs/AutoChangeLog-pr-13769.yml
+++ /dev/null
@@ -1,4 +0,0 @@
-author: "MrJWhit"
-delete-after: True
-changes:
- - rscadd: "Adds a goose bar sign"
diff --git a/html/changelogs/AutoChangeLog-pr-13771.yml b/html/changelogs/AutoChangeLog-pr-13771.yml
deleted file mode 100644
index e450508681..0000000000
--- a/html/changelogs/AutoChangeLog-pr-13771.yml
+++ /dev/null
@@ -1,4 +0,0 @@
-author: "MrJWhit"
-delete-after: True
-changes:
- - tweak: "Donut boxes show what's inside of them now"
diff --git a/html/changelogs/AutoChangeLog-pr-13772.yml b/html/changelogs/AutoChangeLog-pr-13772.yml
deleted file mode 100644
index 109360cace..0000000000
--- a/html/changelogs/AutoChangeLog-pr-13772.yml
+++ /dev/null
@@ -1,5 +0,0 @@
-author: "silicons"
-delete-after: True
-changes:
- - rscadd: "players can now respawn/return to lobby as a ghost after a 15 minute (default) delay and rejoin on another character with some/many restrictions"
- - rscadd: "cryo now preserves everything"
diff --git a/html/changelogs/AutoChangeLog-pr-13773.yml b/html/changelogs/AutoChangeLog-pr-13773.yml
deleted file mode 100644
index 498ac42561..0000000000
--- a/html/changelogs/AutoChangeLog-pr-13773.yml
+++ /dev/null
@@ -1,6 +0,0 @@
-author: "Trilbyspaceclone"
-delete-after: True
-changes:
- - tweak: "Zeolites now use gold rather then uranium for catalyst"
- - tweak: "Zeolites are not as hard to make ph wise"
- - tweak: "Making Zeolites heats up the beaker less allowing for better control"
diff --git a/html/changelogs/AutoChangeLog-pr-13774.yml b/html/changelogs/AutoChangeLog-pr-13774.yml
deleted file mode 100644
index ea3af475f2..0000000000
--- a/html/changelogs/AutoChangeLog-pr-13774.yml
+++ /dev/null
@@ -1,6 +0,0 @@
-author: "keronshb"
-delete-after: True
-changes:
- - rscadd: "Re-adds the Clown Car to the clown uplink"
- - balance: "15 >16 TC cost"
- - balance: "bonks on external airlocks"
diff --git a/html/changelogs/AutoChangeLog-pr-13776.yml b/html/changelogs/AutoChangeLog-pr-13776.yml
deleted file mode 100644
index 773aae9745..0000000000
--- a/html/changelogs/AutoChangeLog-pr-13776.yml
+++ /dev/null
@@ -1,4 +0,0 @@
-author: "DeltaFire15"
-delete-after: True
-changes:
- - tweak: "AIs now only have to kill people once instead of permanently."
diff --git a/html/changelogs/AutoChangeLog-pr-13777.yml b/html/changelogs/AutoChangeLog-pr-13777.yml
deleted file mode 100644
index 0013a93ef5..0000000000
--- a/html/changelogs/AutoChangeLog-pr-13777.yml
+++ /dev/null
@@ -1,4 +0,0 @@
-author: "The Grinch"
-delete-after: True
-changes:
- - rscdel: "infinite presents from hilbert hotel"
diff --git a/html/changelogs/AutoChangeLog-pr-13784.yml b/html/changelogs/AutoChangeLog-pr-13784.yml
deleted file mode 100644
index df8cf7ad57..0000000000
--- a/html/changelogs/AutoChangeLog-pr-13784.yml
+++ /dev/null
@@ -1,4 +0,0 @@
-author: "MrJWhit"
-delete-after: True
-changes:
- - bugfix: "Effects can no longer trigger landmines"
diff --git a/html/changelogs/AutoChangeLog-pr-13785.yml b/html/changelogs/AutoChangeLog-pr-13785.yml
deleted file mode 100644
index 973fb3f74e..0000000000
--- a/html/changelogs/AutoChangeLog-pr-13785.yml
+++ /dev/null
@@ -1,5 +0,0 @@
-author: "Putnam3145"
-delete-after: True
-changes:
- - tweak: "Grab bag works as advertised."
- - balance: "Xeno threat in dynamic tripled."
diff --git a/html/changelogs/AutoChangeLog-pr-13790.yml b/html/changelogs/AutoChangeLog-pr-13790.yml
deleted file mode 100644
index 45ebf00ee7..0000000000
--- a/html/changelogs/AutoChangeLog-pr-13790.yml
+++ /dev/null
@@ -1,5 +0,0 @@
-author: "MrJWhit"
-delete-after: True
-changes:
- - tweak: "Replaced engineering fuel tank with a large fuel tank"
- - tweak: "Changed access to sec suit storage from armory access in every map to other security access"
diff --git a/html/changelogs/AutoChangeLog-pr-13796.yml b/html/changelogs/AutoChangeLog-pr-13796.yml
deleted file mode 100644
index 827cbf7443..0000000000
--- a/html/changelogs/AutoChangeLog-pr-13796.yml
+++ /dev/null
@@ -1,9 +0,0 @@
-author: "keronshb"
-delete-after: True
-changes:
- - rscadd: "Adds a reduced stamina buffer for SCarp users"
- - rscadd: "Gives SCarp users a better parry"
- - rscadd: "Adds the SCarp bundle which includes a bo staff"
- - rscadd: "Lets Carp costumes carry Bo Staffs"
- - balance: "reduces the stamina damage of scarp slightly"
- - balance: "reduced the blockchance of the bo staff"
diff --git a/html/changelogs/AutoChangeLog-pr-13799.yml b/html/changelogs/AutoChangeLog-pr-13799.yml
deleted file mode 100644
index 4f8168aa45..0000000000
--- a/html/changelogs/AutoChangeLog-pr-13799.yml
+++ /dev/null
@@ -1,5 +0,0 @@
-author: "silicons"
-delete-after: True
-changes:
- - bugfix: "ninja gloves no longer hardstun"
- - balance: "ninja gloves now cost half as much to use to compensate"
diff --git a/html/changelogs/AutoChangeLog-pr-13801.yml b/html/changelogs/AutoChangeLog-pr-13801.yml
deleted file mode 100644
index e33b6f4056..0000000000
--- a/html/changelogs/AutoChangeLog-pr-13801.yml
+++ /dev/null
@@ -1,5 +0,0 @@
-author: "SandPoot"
-delete-after: True
-changes:
- - refactor: "Changes the limb grower a lot."
- - bugfix: "\"Limb\" costs on limbgrower are actually displayed like it was meant to all along."
diff --git a/html/changelogs/AutoChangeLog-pr-13803.yml b/html/changelogs/AutoChangeLog-pr-13803.yml
deleted file mode 100644
index 68791ea87a..0000000000
--- a/html/changelogs/AutoChangeLog-pr-13803.yml
+++ /dev/null
@@ -1,4 +0,0 @@
-author: "BlueWildrose"
-delete-after: True
-changes:
- - balance: "The traitor AI can no longer activate the doomsday device while carded."
diff --git a/html/changelogs/AutoChangeLog-pr-13804.yml b/html/changelogs/AutoChangeLog-pr-13804.yml
deleted file mode 100644
index 6b6d56dc5c..0000000000
--- a/html/changelogs/AutoChangeLog-pr-13804.yml
+++ /dev/null
@@ -1,4 +0,0 @@
-author: "timothyteakettle"
-delete-after: True
-changes:
- - bugfix: "circuits get pin data proc is sanitized when text is returned as data"
diff --git a/html/changelogs/AutoChangeLog-pr-13808.yml b/html/changelogs/AutoChangeLog-pr-13808.yml
deleted file mode 100644
index fc97da6161..0000000000
--- a/html/changelogs/AutoChangeLog-pr-13808.yml
+++ /dev/null
@@ -1,5 +0,0 @@
-author: "Putnam3145"
-delete-after: True
-changes:
- - tweak: "You can now exit polycircuit input"
- - bugfix: "Polycircuits now check for range"
diff --git a/html/changelogs/AutoChangeLog-pr-13809.yml b/html/changelogs/AutoChangeLog-pr-13809.yml
deleted file mode 100644
index d63ee33ff1..0000000000
--- a/html/changelogs/AutoChangeLog-pr-13809.yml
+++ /dev/null
@@ -1,4 +0,0 @@
-author: "Putnam3145"
-delete-after: True
-changes:
- - tweak: "Gear harness now covers nothing."
diff --git a/html/changelogs/AutoChangeLog-pr-13811.yml b/html/changelogs/AutoChangeLog-pr-13811.yml
deleted file mode 100644
index da2691d8f5..0000000000
--- a/html/changelogs/AutoChangeLog-pr-13811.yml
+++ /dev/null
@@ -1,4 +0,0 @@
-author: "BlackMajor"
-delete-after: True
-changes:
- - tweak: "Cyborg hypospray no longer injects if it means OD'ing while on help intent."
diff --git a/html/changelogs/AutoChangeLog-pr-13813.yml b/html/changelogs/AutoChangeLog-pr-13813.yml
deleted file mode 100644
index ce283eb788..0000000000
--- a/html/changelogs/AutoChangeLog-pr-13813.yml
+++ /dev/null
@@ -1,5 +0,0 @@
-author: "silicons"
-delete-after: True
-changes:
- - tweak: "command headsets are 120% instead of 160%"
- - bugfix: "no more emote italics"
diff --git a/html/changelogs/AutoChangeLog-pr-13814.yml b/html/changelogs/AutoChangeLog-pr-13814.yml
deleted file mode 100644
index 9bd0be5ac0..0000000000
--- a/html/changelogs/AutoChangeLog-pr-13814.yml
+++ /dev/null
@@ -1,4 +0,0 @@
-author: "Xantholne"
-delete-after: True
-changes:
- - bugfix: "Twin Sword Sheaths have an equipment icon and icon when worn now and make a sound when sheathed/unsheathed"
diff --git a/html/changelogs/AutoChangeLog-pr-13815.yml b/html/changelogs/AutoChangeLog-pr-13815.yml
deleted file mode 100644
index 630ca9d7f7..0000000000
--- a/html/changelogs/AutoChangeLog-pr-13815.yml
+++ /dev/null
@@ -1,4 +0,0 @@
-author: "Yakumo Chen"
-delete-after: True
-changes:
- - balance: "Slime Jelly is no longer obtainable from slimepeople. Go ask Xenobio"
diff --git a/html/changelogs/AutoChangeLog-pr-13819.yml b/html/changelogs/AutoChangeLog-pr-13819.yml
deleted file mode 100644
index 77b1ec9a3d..0000000000
--- a/html/changelogs/AutoChangeLog-pr-13819.yml
+++ /dev/null
@@ -1,5 +0,0 @@
-author: "Hatterhat"
-delete-after: True
-changes:
- - bugfix: "The survival dagger light on the sprite now actually turns on and off."
- - balance: "The survival dagger in the glaive kit that can also be bought by itself is now better at butchering things."
diff --git a/html/changelogs/AutoChangeLog-pr-13822.yml b/html/changelogs/AutoChangeLog-pr-13822.yml
deleted file mode 100644
index 743bdb500b..0000000000
--- a/html/changelogs/AutoChangeLog-pr-13822.yml
+++ /dev/null
@@ -1,4 +0,0 @@
-author: "DeltaFire15"
-delete-after: True
-changes:
- - bugfix: "Bloodcult stunhands now work against clockies like they were supposed to instead of hardstunning."
diff --git a/html/changelogs/AutoChangeLog-pr-13823.yml b/html/changelogs/AutoChangeLog-pr-13823.yml
deleted file mode 100644
index 35d70339f7..0000000000
--- a/html/changelogs/AutoChangeLog-pr-13823.yml
+++ /dev/null
@@ -1,4 +0,0 @@
-author: "MrJWhit"
-delete-after: True
-changes:
- - tweak: "Christmas starts on the 18th now"
diff --git a/html/changelogs/AutoChangeLog-pr-13825.yml b/html/changelogs/AutoChangeLog-pr-13825.yml
deleted file mode 100644
index ae82c1cd8e..0000000000
--- a/html/changelogs/AutoChangeLog-pr-13825.yml
+++ /dev/null
@@ -1,4 +0,0 @@
-author: "raspy-on-osu"
-delete-after: True
-changes:
- - tweak: "windoor open length"
diff --git a/html/changelogs/AutoChangeLog-pr-13826.yml b/html/changelogs/AutoChangeLog-pr-13826.yml
deleted file mode 100644
index 959dc738b1..0000000000
--- a/html/changelogs/AutoChangeLog-pr-13826.yml
+++ /dev/null
@@ -1,9 +0,0 @@
-author: "LetterN"
-delete-after: True
-changes:
- - rscadd: "Coin & Holochip support for slot machine"
- - admin: "Stickybans are now saved in the DB too"
- - soundadd: "Immersive ™ audio reverbs. (also adds multiz audio)"
- - code_imp: "Semi-hardsync from TG"
- - code_imp: "Updates rust-g"
- - code_imp: "Uses git CI instead of travis/appveyor now"
diff --git a/html/changelogs/AutoChangeLog-pr-13828.yml b/html/changelogs/AutoChangeLog-pr-13828.yml
deleted file mode 100644
index 282b8a01e0..0000000000
--- a/html/changelogs/AutoChangeLog-pr-13828.yml
+++ /dev/null
@@ -1,4 +0,0 @@
-author: "timothyteakettle"
-delete-after: True
-changes:
- - bugfix: "you can now only entwine tails with people who have a tail"
diff --git a/html/changelogs/AutoChangeLog-pr-13830.yml b/html/changelogs/AutoChangeLog-pr-13830.yml
deleted file mode 100644
index c126670246..0000000000
--- a/html/changelogs/AutoChangeLog-pr-13830.yml
+++ /dev/null
@@ -1,4 +0,0 @@
-author: "timothyteakettle"
-delete-after: True
-changes:
- - bugfix: "apids render now"
diff --git a/html/changelogs/AutoChangeLog-pr-13832.yml b/html/changelogs/AutoChangeLog-pr-13832.yml
deleted file mode 100644
index 756edb7657..0000000000
--- a/html/changelogs/AutoChangeLog-pr-13832.yml
+++ /dev/null
@@ -1,4 +0,0 @@
-author: "Arturlang"
-delete-after: True
-changes:
- - bugfix: "Bloodsuckers tresspass ability can no longer work while they are not awake."
diff --git a/html/changelogs/AutoChangeLog-pr-13833.yml b/html/changelogs/AutoChangeLog-pr-13833.yml
deleted file mode 100644
index 8312c7a5a3..0000000000
--- a/html/changelogs/AutoChangeLog-pr-13833.yml
+++ /dev/null
@@ -1,4 +0,0 @@
-author: "kiwedespars"
-delete-after: True
-changes:
- - balance: "balanced bone gauntlets."
diff --git a/html/changelogs/AutoChangeLog-pr-13834.yml b/html/changelogs/AutoChangeLog-pr-13834.yml
deleted file mode 100644
index 46cedff5d5..0000000000
--- a/html/changelogs/AutoChangeLog-pr-13834.yml
+++ /dev/null
@@ -1,4 +0,0 @@
-author: "zeroisthebiggay"
-delete-after: True
-changes:
- - rscadd: "Traitor assistants can now purchase the patented POGBox! Put TC into it for even higher damage!"
diff --git a/html/changelogs/AutoChangeLog-pr-13835.yml b/html/changelogs/AutoChangeLog-pr-13835.yml
deleted file mode 100644
index 0ac90921c3..0000000000
--- a/html/changelogs/AutoChangeLog-pr-13835.yml
+++ /dev/null
@@ -1,4 +0,0 @@
-author: "silicons"
-delete-after: True
-changes:
- - rscadd: "pugilists can now parry"
diff --git a/html/changelogs/AutoChangeLog-pr-13837.yml b/html/changelogs/AutoChangeLog-pr-13837.yml
deleted file mode 100644
index eda0b77a83..0000000000
--- a/html/changelogs/AutoChangeLog-pr-13837.yml
+++ /dev/null
@@ -1,4 +0,0 @@
-author: "silicons"
-delete-after: True
-changes:
- - tweak: "anyone new to the server is lucky enough to have their sprint default to toggle instead of hold"
diff --git a/html/changelogs/AutoChangeLog-pr-13838.yml b/html/changelogs/AutoChangeLog-pr-13838.yml
deleted file mode 100644
index deff5913b3..0000000000
--- a/html/changelogs/AutoChangeLog-pr-13838.yml
+++ /dev/null
@@ -1,4 +0,0 @@
-author: "silicons"
-delete-after: True
-changes:
- - bugfix: "things in DEATHCOMA do not deathgasp on death"
diff --git a/html/changelogs/AutoChangeLog-pr-13844.yml b/html/changelogs/AutoChangeLog-pr-13844.yml
deleted file mode 100644
index cd1f7a25d4..0000000000
--- a/html/changelogs/AutoChangeLog-pr-13844.yml
+++ /dev/null
@@ -1,4 +0,0 @@
-author: "Arturlang"
-delete-after: True
-changes:
- - bugfix: "Fixes the mint machine's UI"
diff --git a/html/changelogs/AutoChangeLog-pr-13845.yml b/html/changelogs/AutoChangeLog-pr-13845.yml
deleted file mode 100644
index d10485ae9f..0000000000
--- a/html/changelogs/AutoChangeLog-pr-13845.yml
+++ /dev/null
@@ -1,4 +0,0 @@
-author: "silicons"
-delete-after: True
-changes:
- - bugfix: "dullahans enabled"
diff --git a/html/changelogs/AutoChangeLog-pr-13846.yml b/html/changelogs/AutoChangeLog-pr-13846.yml
deleted file mode 100644
index 68e013acf0..0000000000
--- a/html/changelogs/AutoChangeLog-pr-13846.yml
+++ /dev/null
@@ -1,4 +0,0 @@
-author: "DeltaFire15"
-delete-after: True
-changes:
- - balance: "Fleshmend, Anatomic Panacea and bloodsucker healing now work for Synths / IPCs."
diff --git a/html/changelogs/AutoChangeLog-pr-13850.yml b/html/changelogs/AutoChangeLog-pr-13850.yml
deleted file mode 100644
index 64c47ade40..0000000000
--- a/html/changelogs/AutoChangeLog-pr-13850.yml
+++ /dev/null
@@ -1,5 +0,0 @@
-author: "DeltaFire15"
-delete-after: True
-changes:
- - bugfix: "Self-fueling weldingtools recharge fuel properly again."
- - bugfix: "Brass welders now actually recharge faster than experimental ones."
diff --git a/html/changelogs/AutoChangeLog-pr-13855.yml b/html/changelogs/AutoChangeLog-pr-13855.yml
deleted file mode 100644
index 0eed195acd..0000000000
--- a/html/changelogs/AutoChangeLog-pr-13855.yml
+++ /dev/null
@@ -1,8 +0,0 @@
-author: "Chiirno"
-delete-after: True
-changes:
- - rscadd: "Paramedics office and Surgery Storage Room"
- - tweak: "Remodeled the surgery room, as well as shrunk Morgue and Starboard Emergency Storage.
-Fiddled with some areas for better map edit clarity and fixed one runtime in Vacant Office A."
- - imageadd: "Added the paramedic closet sprite, a paramedic colored medical3 closet."
- - code_imp: "Added a paramedic closet, which is the standard medical3 closet with their suit, a pinpointer, and a crew monitor added."
diff --git a/html/changelogs/AutoChangeLog-pr-13856.yml b/html/changelogs/AutoChangeLog-pr-13856.yml
deleted file mode 100644
index 583fb38cc2..0000000000
--- a/html/changelogs/AutoChangeLog-pr-13856.yml
+++ /dev/null
@@ -1,5 +0,0 @@
-author: "Putnam3145"
-delete-after: True
-changes:
- - bugfix: "gear harness alt-click is now sane"
- - code_imp: "rolldown() and toggle_jumpsuit_adjust() now no longer mix behavior-that-should-be-overridden and behavior-that-shouldn't-be-overridden in ways that make no sense."
diff --git a/html/changelogs/AutoChangeLog-pr-13859.yml b/html/changelogs/AutoChangeLog-pr-13859.yml
deleted file mode 100644
index 2d6dc5c25a..0000000000
--- a/html/changelogs/AutoChangeLog-pr-13859.yml
+++ /dev/null
@@ -1,4 +0,0 @@
-author: "timothyteakettle"
-delete-after: True
-changes:
- - rscadd: "adds unlockable loadout items, corresponding category in loadouts, etc"
diff --git a/html/changelogs/AutoChangeLog-pr-13867.yml b/html/changelogs/AutoChangeLog-pr-13867.yml
deleted file mode 100644
index dd1e44e64c..0000000000
--- a/html/changelogs/AutoChangeLog-pr-13867.yml
+++ /dev/null
@@ -1,4 +0,0 @@
-author: "Putnam3145"
-delete-after: True
-changes:
- - balance: "Zeolites now only generate 1/5 the heat when reacting and don't require a catalyst."
diff --git a/html/changelogs/AutoChangeLog-pr-13869.yml b/html/changelogs/AutoChangeLog-pr-13869.yml
deleted file mode 100644
index 5d4ca4817c..0000000000
--- a/html/changelogs/AutoChangeLog-pr-13869.yml
+++ /dev/null
@@ -1,6 +0,0 @@
-author: "timothyteakettle"
-delete-after: True
-changes:
- - tweak: "slime puddles are no longer layered down one layer"
- - tweak: "you cannot tackle with two paralysed arms"
- - tweak: "tackling with a single paralysed arm lowers your tackle roll by 2"
diff --git a/html/changelogs/AutoChangeLog-pr-13870.yml b/html/changelogs/AutoChangeLog-pr-13870.yml
deleted file mode 100644
index 820c524224..0000000000
--- a/html/changelogs/AutoChangeLog-pr-13870.yml
+++ /dev/null
@@ -1,4 +0,0 @@
-author: "silicons"
-delete-after: True
-changes:
- - bugfix: "Magrifle ammo no longer glows."
diff --git a/html/changelogs/AutoChangeLog-pr-13871.yml b/html/changelogs/AutoChangeLog-pr-13871.yml
deleted file mode 100644
index f667abe816..0000000000
--- a/html/changelogs/AutoChangeLog-pr-13871.yml
+++ /dev/null
@@ -1,5 +0,0 @@
-author: "NT Cleaning Crews On Break"
-delete-after: True
-changes:
- - rscadd: "Most kinds of dirt, grime, and debris are now persistent. Get to work, jannies."
- - rscadd: "Dirt can now be removed by tile replacements. Other cleanable decals can't, though."
diff --git a/html/changelogs/AutoChangeLog-pr-13873.yml b/html/changelogs/AutoChangeLog-pr-13873.yml
deleted file mode 100644
index 320a5b69a4..0000000000
--- a/html/changelogs/AutoChangeLog-pr-13873.yml
+++ /dev/null
@@ -1,4 +0,0 @@
-author: "BlueWildrose"
-delete-after: True
-changes:
- - tweak: "Nyctophobia quirk now has some light lag compensation."
diff --git a/html/changelogs/AutoChangeLog-pr-13881.yml b/html/changelogs/AutoChangeLog-pr-13881.yml
deleted file mode 100644
index 0ad2d3afc8..0000000000
--- a/html/changelogs/AutoChangeLog-pr-13881.yml
+++ /dev/null
@@ -1,4 +0,0 @@
-author: "BlueWildrose"
-delete-after: True
-changes:
- - rscadd: "PubbyStation now has two Christmas Tree spawners."
diff --git a/html/changelogs/AutoChangeLog-pr-13882.yml b/html/changelogs/AutoChangeLog-pr-13882.yml
deleted file mode 100644
index fe545bdc23..0000000000
--- a/html/changelogs/AutoChangeLog-pr-13882.yml
+++ /dev/null
@@ -1,4 +0,0 @@
-author: "ERP mains"
-delete-after: True
-changes:
- - rscadd: "Subtler Around Table is now a verb"
diff --git a/html/changelogs/AutoChangeLog-pr-13883.yml b/html/changelogs/AutoChangeLog-pr-13883.yml
deleted file mode 100644
index 884adafffe..0000000000
--- a/html/changelogs/AutoChangeLog-pr-13883.yml
+++ /dev/null
@@ -1,5 +0,0 @@
-author: "silicons"
-delete-after: True
-changes:
- - rscadd: "set-pose has been added"
- - tweak: "temporary flavor text renamed to set pose, fully visible in examine"
diff --git a/html/changelogs/AutoChangeLog-pr-13884.yml b/html/changelogs/AutoChangeLog-pr-13884.yml
deleted file mode 100644
index f2b9233690..0000000000
--- a/html/changelogs/AutoChangeLog-pr-13884.yml
+++ /dev/null
@@ -1,5 +0,0 @@
-author: "Hatterhat"
-delete-after: True
-changes:
- - rscadd: "The dock-silver standard set by Box and Meta has been enforced across maps in rotation (Delta, Pubby, Lambda)."
- - bugfix: "The Box whiteship now has its missing tiny fan back."
diff --git a/html/changelogs/AutoChangeLog-pr-13885.yml b/html/changelogs/AutoChangeLog-pr-13885.yml
deleted file mode 100644
index 88c23d30f1..0000000000
--- a/html/changelogs/AutoChangeLog-pr-13885.yml
+++ /dev/null
@@ -1,4 +0,0 @@
-author: "raspy-on-osu"
-delete-after: True
-changes:
- - tweak: "space heater heating range and power"
diff --git a/html/changelogs/AutoChangeLog-pr-13887.yml b/html/changelogs/AutoChangeLog-pr-13887.yml
deleted file mode 100644
index 83069a4e64..0000000000
--- a/html/changelogs/AutoChangeLog-pr-13887.yml
+++ /dev/null
@@ -1,4 +0,0 @@
-author: "HeroWithYay"
-delete-after: True
-changes:
- - bugfix: "Changed description of Necrotizing Fasciitis symptom."
diff --git a/html/changelogs/AutoChangeLog-pr-13892.yml b/html/changelogs/AutoChangeLog-pr-13892.yml
deleted file mode 100644
index 976b395826..0000000000
--- a/html/changelogs/AutoChangeLog-pr-13892.yml
+++ /dev/null
@@ -1,4 +0,0 @@
-author: "silicons"
-delete-after: True
-changes:
- - balance: "changeling combat mutations rebalanced. most of them take chemicals to upkeep now."
diff --git a/html/changelogs/AutoChangeLog-pr-13893.yml b/html/changelogs/AutoChangeLog-pr-13893.yml
deleted file mode 100644
index 9eb7a3f79d..0000000000
--- a/html/changelogs/AutoChangeLog-pr-13893.yml
+++ /dev/null
@@ -1,4 +0,0 @@
-author: "silicons"
-delete-after: True
-changes:
- - tweak: "Meth and changeling adrenals no longer ignore all slowdowns, rather damage slowdowns."
diff --git a/html/changelogs/AutoChangeLog-pr-13894.yml b/html/changelogs/AutoChangeLog-pr-13894.yml
deleted file mode 100644
index 31e1e66328..0000000000
--- a/html/changelogs/AutoChangeLog-pr-13894.yml
+++ /dev/null
@@ -1,4 +0,0 @@
-author: "silicons"
-delete-after: True
-changes:
- - tweak: "temperature slowdown divisor nerfed to 35 from 20."
diff --git a/html/changelogs/AutoChangeLog-pr-13896.yml b/html/changelogs/AutoChangeLog-pr-13896.yml
deleted file mode 100644
index f733efa09d..0000000000
--- a/html/changelogs/AutoChangeLog-pr-13896.yml
+++ /dev/null
@@ -1,6 +0,0 @@
-author: "Sonic121x"
-delete-after: True
-changes:
- - rscadd: "alarm ert hardsuit sprite for naga and canine"
- - tweak: "adjust the naga ert hardsuit to cover the hand"
- - bugfix: "cydonia hardsuit helmet"
diff --git a/html/changelogs/AutoChangeLog-pr-13897.yml b/html/changelogs/AutoChangeLog-pr-13897.yml
deleted file mode 100644
index 05637b0908..0000000000
--- a/html/changelogs/AutoChangeLog-pr-13897.yml
+++ /dev/null
@@ -1,5 +0,0 @@
-author: "keronshb"
-delete-after: True
-changes:
- - bugfix: "Allows Energy Bola to be caught"
- - balance: "This also allows them to be dropped/picked up."
diff --git a/html/changelogs/AutoChangeLog-pr-13898.yml b/html/changelogs/AutoChangeLog-pr-13898.yml
deleted file mode 100644
index cb4e0fd52d..0000000000
--- a/html/changelogs/AutoChangeLog-pr-13898.yml
+++ /dev/null
@@ -1,5 +0,0 @@
-author: "Putnam3145"
-delete-after: True
-changes:
- - balance: "Regen coma now puts into a coma even from crit or while unconscious."
- - bugfix: "Regen coma now properly weakens while asleep."
diff --git a/html/changelogs/AutoChangeLog-pr-13900.yml b/html/changelogs/AutoChangeLog-pr-13900.yml
deleted file mode 100644
index a25c8af1ed..0000000000
--- a/html/changelogs/AutoChangeLog-pr-13900.yml
+++ /dev/null
@@ -1,4 +0,0 @@
-author: "Xantholne"
-delete-after: True
-changes:
- - rscadd: "New parrots from the RP server, can be found in Bird Crate in Cargo"
diff --git a/html/changelogs/AutoChangeLog-pr-13902.yml b/html/changelogs/AutoChangeLog-pr-13902.yml
deleted file mode 100644
index ca548d816f..0000000000
--- a/html/changelogs/AutoChangeLog-pr-13902.yml
+++ /dev/null
@@ -1,4 +0,0 @@
-author: "timothyteakettle"
-delete-after: True
-changes:
- - rscadd: "avian/digitigrade legs have been added for slimes"
diff --git a/html/changelogs/AutoChangeLog-pr-13903.yml b/html/changelogs/AutoChangeLog-pr-13903.yml
deleted file mode 100644
index fd66c4b0c6..0000000000
--- a/html/changelogs/AutoChangeLog-pr-13903.yml
+++ /dev/null
@@ -1,4 +0,0 @@
-author: "DeltaFire15"
-delete-after: True
-changes:
- - bugfix: "Changelings no longer double-deathgasp when activating the regen stasis ability while not dead."
diff --git a/html/changelogs/AutoChangeLog-pr-13904.yml b/html/changelogs/AutoChangeLog-pr-13904.yml
deleted file mode 100644
index 90f7d77e17..0000000000
--- a/html/changelogs/AutoChangeLog-pr-13904.yml
+++ /dev/null
@@ -1,4 +0,0 @@
-author: "DeltaFire15"
-delete-after: True
-changes:
- - tweak: "Instant summons can no longer do wacky stuff with disposals (and nukes)."
diff --git a/html/changelogs/AutoChangeLog-pr-13905.yml b/html/changelogs/AutoChangeLog-pr-13905.yml
deleted file mode 100644
index 16b464bc20..0000000000
--- a/html/changelogs/AutoChangeLog-pr-13905.yml
+++ /dev/null
@@ -1,4 +0,0 @@
-author: "zeroisthebiggay"
-delete-after: True
-changes:
- - imageadd: "cool codex cicatrix inhands"
diff --git a/html/changelogs/AutoChangeLog-pr-13909.yml b/html/changelogs/AutoChangeLog-pr-13909.yml
deleted file mode 100644
index e4f0f1e401..0000000000
--- a/html/changelogs/AutoChangeLog-pr-13909.yml
+++ /dev/null
@@ -1,4 +0,0 @@
-author: "silicons"
-delete-after: True
-changes:
- - rscadd: "Twitch Plays: Clown Car"
diff --git a/html/changelogs/AutoChangeLog-pr-13911.yml b/html/changelogs/AutoChangeLog-pr-13911.yml
deleted file mode 100644
index 9e96103b2b..0000000000
--- a/html/changelogs/AutoChangeLog-pr-13911.yml
+++ /dev/null
@@ -1,4 +0,0 @@
-author: "raspy-on-osu"
-delete-after: True
-changes:
- - spellcheck: "salicylic acid"
diff --git a/html/changelogs/AutoChangeLog-pr-13913.yml b/html/changelogs/AutoChangeLog-pr-13913.yml
deleted file mode 100644
index a25e054a6f..0000000000
--- a/html/changelogs/AutoChangeLog-pr-13913.yml
+++ /dev/null
@@ -1,4 +0,0 @@
-author: "keronshb"
-delete-after: True
-changes:
- - bugfix: "Fixes the parry data for scarp"
diff --git a/html/changelogs/AutoChangeLog-pr-13914.yml b/html/changelogs/AutoChangeLog-pr-13914.yml
deleted file mode 100644
index b9efe2a893..0000000000
--- a/html/changelogs/AutoChangeLog-pr-13914.yml
+++ /dev/null
@@ -1,6 +0,0 @@
-author: "EmeraldSundisk"
-delete-after: True
-changes:
- - rscadd: "Adds a few new area designations primarily for CogStation, incorporates them into said map"
- - tweak: "Reorganizes some area designations for ease of use, along with renaming the central \"Router\" to \"Routing Depot\""
- - bugfix: "Fixes an incorrectly designated area in CogStation"
diff --git a/html/changelogs/AutoChangeLog-pr-13915.yml b/html/changelogs/AutoChangeLog-pr-13915.yml
deleted file mode 100644
index 2853dcb9ad..0000000000
--- a/html/changelogs/AutoChangeLog-pr-13915.yml
+++ /dev/null
@@ -1,4 +0,0 @@
-author: "Xantholne"
-delete-after: True
-changes:
- - bugfix: "Fixed new birds changing back to basic parrot when sitting"
diff --git a/html/changelogs/AutoChangeLog-pr-13916.yml b/html/changelogs/AutoChangeLog-pr-13916.yml
deleted file mode 100644
index 0ec04707a5..0000000000
--- a/html/changelogs/AutoChangeLog-pr-13916.yml
+++ /dev/null
@@ -1,4 +0,0 @@
-author: "timothyteakettle"
-delete-after: True
-changes:
- - rscadd: "re-adds the holoform verb for people who want to use it over going through the char list"
diff --git a/html/changelogs/AutoChangeLog-pr-13917.yml b/html/changelogs/AutoChangeLog-pr-13917.yml
deleted file mode 100644
index 5eabd640f7..0000000000
--- a/html/changelogs/AutoChangeLog-pr-13917.yml
+++ /dev/null
@@ -1,4 +0,0 @@
-author: "timothyteakettle"
-delete-after: True
-changes:
- - rscadd: "*squeak"
diff --git a/html/changelogs/AutoChangeLog-pr-13924.yml b/html/changelogs/AutoChangeLog-pr-13924.yml
deleted file mode 100644
index 71092c567d..0000000000
--- a/html/changelogs/AutoChangeLog-pr-13924.yml
+++ /dev/null
@@ -1,4 +0,0 @@
-author: "SandPoot"
-delete-after: True
-changes:
- - tweak: "You can attack a pile of money on the floor with your id to put it all in quickly."
diff --git a/html/changelogs/AutoChangeLog-pr-13926.yml b/html/changelogs/AutoChangeLog-pr-13926.yml
deleted file mode 100644
index 4e92bacdb4..0000000000
--- a/html/changelogs/AutoChangeLog-pr-13926.yml
+++ /dev/null
@@ -1,4 +0,0 @@
-author: "MrJWhit"
-delete-after: True
-changes:
- - rscdel: "Removes the screen flashing on climax."
diff --git a/html/changelogs/AutoChangeLog-pr-13930.yml b/html/changelogs/AutoChangeLog-pr-13930.yml
deleted file mode 100644
index 282f3fa30a..0000000000
--- a/html/changelogs/AutoChangeLog-pr-13930.yml
+++ /dev/null
@@ -1,4 +0,0 @@
-author: "MrJWhit"
-delete-after: True
-changes:
- - tweak: "Small fixes on security on boxstation"
diff --git a/html/changelogs/AutoChangeLog-pr-13931.yml b/html/changelogs/AutoChangeLog-pr-13931.yml
deleted file mode 100644
index fd903f2d6e..0000000000
--- a/html/changelogs/AutoChangeLog-pr-13931.yml
+++ /dev/null
@@ -1,4 +0,0 @@
-author: "shellspeed1"
-delete-after: True
-changes:
- - rscadd: "Adds the disposable sentry gun from tg for 11tc each."
diff --git a/html/changelogs/AutoChangeLog-pr-13932.yml b/html/changelogs/AutoChangeLog-pr-13932.yml
deleted file mode 100644
index 955d9f5741..0000000000
--- a/html/changelogs/AutoChangeLog-pr-13932.yml
+++ /dev/null
@@ -1,4 +0,0 @@
-author: "shellspeed1"
-delete-after: True
-changes:
- - tweak: "Xenomorph powers now list plasma cost in their description."
diff --git a/html/changelogs/AutoChangeLog-pr-13934.yml b/html/changelogs/AutoChangeLog-pr-13934.yml
deleted file mode 100644
index 74f8ece6fc..0000000000
--- a/html/changelogs/AutoChangeLog-pr-13934.yml
+++ /dev/null
@@ -1,4 +0,0 @@
-author: "shellspeed1"
-delete-after: True
-changes:
- - rscadd: "The bluespace navigation gigabeacon design has been added to shuttle research for those wanting to take their ships around space more."
diff --git a/html/changelogs/AutoChangeLog-pr-13936.yml b/html/changelogs/AutoChangeLog-pr-13936.yml
deleted file mode 100644
index 9b15d2232a..0000000000
--- a/html/changelogs/AutoChangeLog-pr-13936.yml
+++ /dev/null
@@ -1,4 +0,0 @@
-author: "BlueWildrose"
-delete-after: True
-changes:
- - bugfix: "Polychromic hoodies that were obtained from the loadout have functional colorable hoods now."
diff --git a/html/changelogs/AutoChangeLog-pr-13938.yml b/html/changelogs/AutoChangeLog-pr-13938.yml
deleted file mode 100644
index 34d76a190b..0000000000
--- a/html/changelogs/AutoChangeLog-pr-13938.yml
+++ /dev/null
@@ -1,4 +0,0 @@
-author: "timothyteakettle"
-delete-after: True
-changes:
- - rscadd: "anthromorphic synth species"
diff --git a/html/changelogs/AutoChangeLog-pr-13940.yml b/html/changelogs/AutoChangeLog-pr-13940.yml
deleted file mode 100644
index 60cbcc9a19..0000000000
--- a/html/changelogs/AutoChangeLog-pr-13940.yml
+++ /dev/null
@@ -1,4 +0,0 @@
-author: "Chiirno"
-delete-after: True
-changes:
- - rscadd: "Added the paramedics EVA suit as a purchase from the cargo console."
diff --git a/html/changelogs/AutoChangeLog-pr-13941.yml b/html/changelogs/AutoChangeLog-pr-13941.yml
deleted file mode 100644
index 5a72376ebb..0000000000
--- a/html/changelogs/AutoChangeLog-pr-13941.yml
+++ /dev/null
@@ -1,4 +0,0 @@
-author: "Chiirno"
-delete-after: True
-changes:
- - bugfix: "Portable Chem Mixer now researchable from biotech node."
diff --git a/html/changelogs/AutoChangeLog-pr-13943.yml b/html/changelogs/AutoChangeLog-pr-13943.yml
deleted file mode 100644
index 405d6b0d93..0000000000
--- a/html/changelogs/AutoChangeLog-pr-13943.yml
+++ /dev/null
@@ -1,6 +0,0 @@
-author: "Hatterhat"
-delete-after: True
-changes:
- - spellcheck: "Utility uniforms now comply with the \"nonproper equipment names\" thing."
- - bugfix: "The CapDrobe now allows the captain to get his own clothes for free. Probably."
- - tweak: "All captains' clothes now offer 15 woundarmor, up from the 5. Because apparently only the suit and tie and its suitskirt subtype have this wound armor, which is dumb."
diff --git a/html/changelogs/AutoChangeLog-pr-13945.yml b/html/changelogs/AutoChangeLog-pr-13945.yml
deleted file mode 100644
index 91b8bb9498..0000000000
--- a/html/changelogs/AutoChangeLog-pr-13945.yml
+++ /dev/null
@@ -1,4 +0,0 @@
-author: "DeltaFire15"
-delete-after: True
-changes:
- - rscadd: "IPC cells & power cords are now printable after they are researched."
diff --git a/html/changelogs/AutoChangeLog-pr-13946.yml b/html/changelogs/AutoChangeLog-pr-13946.yml
deleted file mode 100644
index d7f3e15024..0000000000
--- a/html/changelogs/AutoChangeLog-pr-13946.yml
+++ /dev/null
@@ -1,4 +0,0 @@
-author: "Ryll/Shaps"
-delete-after: True
-changes:
- - admin: "Fixed an issue with player logs becoming confused when someone triggers multiple events within one second (like being attacked by two people at the same time) that would cause holes in the logs"
diff --git a/html/changelogs/AutoChangeLog-pr-13947.yml b/html/changelogs/AutoChangeLog-pr-13947.yml
deleted file mode 100644
index 0388efc701..0000000000
--- a/html/changelogs/AutoChangeLog-pr-13947.yml
+++ /dev/null
@@ -1,4 +0,0 @@
-author: "Chiirno"
-delete-after: True
-changes:
- - tweak: "Chem masters can now dispense 20 instances of its outputs instead of 10."
diff --git a/html/changelogs/AutoChangeLog-pr-13948.yml b/html/changelogs/AutoChangeLog-pr-13948.yml
deleted file mode 100644
index 73c5ba6b1a..0000000000
--- a/html/changelogs/AutoChangeLog-pr-13948.yml
+++ /dev/null
@@ -1,11 +0,0 @@
-author: "necromanceranne"
-delete-after: True
-changes:
- - rscadd: "Bokken now come in two lengths; full and wakizashi, and two varieties: wood and ironwood. They have different stats for all four."
- - rscadd: "Bokken require menu crafting and part construction, as well as more complicated materials."
- - tweak: "Bokken (long and short) require wood, cloth and leather to craft with a hatchet and screwdriver."
- - tweak: "Ironwood bokken (long and short) require ironcap logs, cloth and leather to craft with a hatchet, screwdriver and welder."
- - balance: "Twin sheathes can only fit a pair of blades (longsword + shortsword) or they can fit two shortswords."
- - bugfix: "Fixed a twin sheath runtime."
- - imageadd: "A lot of bokken related sprites received an overhaul. Added overlay sprites for weapons sheathed in the twin sheathes."
- - imageadd: "The extradimensional blade received improved sprites for inhands/back sprites."
diff --git a/html/changelogs/AutoChangeLog-pr-13950.yml b/html/changelogs/AutoChangeLog-pr-13950.yml
deleted file mode 100644
index 28affe7ebe..0000000000
--- a/html/changelogs/AutoChangeLog-pr-13950.yml
+++ /dev/null
@@ -1,6 +0,0 @@
-author: "TripleShades"
-delete-after: True
-changes:
- - rscadd: "New Paramedic Office next to Genetics where the old Genetics Reception used to be
-change: Surgery, Surgery Observation, and Recovery Hall layout revamped drastically
-change: Maints below Surgery lowered by one tile to recover lost tile space from Surgery expansion"
diff --git a/html/changelogs/AutoChangeLog-pr-13951.yml b/html/changelogs/AutoChangeLog-pr-13951.yml
deleted file mode 100644
index fe3ac84523..0000000000
--- a/html/changelogs/AutoChangeLog-pr-13951.yml
+++ /dev/null
@@ -1,4 +0,0 @@
-author: "BlueWildrose"
-delete-after: True
-changes:
- - tweak: "You can now have a max-roundstart-dicksize-config inch long johnson before you start suffering blood loss and slowdowns instead of a 20 inch one."
diff --git a/html/changelogs/AutoChangeLog-pr-13954.yml b/html/changelogs/AutoChangeLog-pr-13954.yml
deleted file mode 100644
index a8751d66ca..0000000000
--- a/html/changelogs/AutoChangeLog-pr-13954.yml
+++ /dev/null
@@ -1,6 +0,0 @@
-author: "EmeraldSundisk"
-delete-after: True
-changes:
- - rscadd: "Adds a new \"Computer Core\" area designation for CogStation"
- - bugfix: "Fixes some missing area strings"
- - tweak: "Replaces some firelocks with directional ones as to ensure desks/counters can still be accessed"
diff --git a/html/changelogs/AutoChangeLog-pr-13955.yml b/html/changelogs/AutoChangeLog-pr-13955.yml
deleted file mode 100644
index 1d43dd6b95..0000000000
--- a/html/changelogs/AutoChangeLog-pr-13955.yml
+++ /dev/null
@@ -1,5 +0,0 @@
-author: "Chiirno"
-delete-after: True
-changes:
- - tweak: "Nightmare now deals additional damage to most light sources."
- - bugfix: "Nightmare now one-shots miners beacons and glowshrooms"
diff --git a/html/changelogs/AutoChangeLog-pr-13959.yml b/html/changelogs/AutoChangeLog-pr-13959.yml
deleted file mode 100644
index 1303768344..0000000000
--- a/html/changelogs/AutoChangeLog-pr-13959.yml
+++ /dev/null
@@ -1,6 +0,0 @@
-author: "necromanceranne"
-delete-after: True
-changes:
- - bugfix: "You can now make all the variants of the bokken."
- - bugfix: "Removes a duplicate sprite."
- - tweak: "Renames all instances of 'ironwood' to 'steelwood'."
diff --git a/html/changelogs/AutoChangeLog-pr-13961.yml b/html/changelogs/AutoChangeLog-pr-13961.yml
deleted file mode 100644
index f0a6cc267d..0000000000
--- a/html/changelogs/AutoChangeLog-pr-13961.yml
+++ /dev/null
@@ -1,6 +0,0 @@
-author: "MrJWhit"
-delete-after: True
-changes:
- - tweak: "Removed the wires connecting the AI from the rest of the station on cogstation."
- - tweak: "Fixes experimenter on cogstation."
- - tweak: "Less pipes in the overall area in toxins on cogstation"
diff --git a/html/changelogs/AutoChangeLog-pr-13963.yml b/html/changelogs/AutoChangeLog-pr-13963.yml
deleted file mode 100644
index 8a1e923aa0..0000000000
--- a/html/changelogs/AutoChangeLog-pr-13963.yml
+++ /dev/null
@@ -1,4 +0,0 @@
-author: "necromanceranne"
-delete-after: True
-changes:
- - rscadd: "Adds new roboticist labcoat sprites!"
diff --git a/html/changelogs/AutoChangeLog-pr-13965.yml b/html/changelogs/AutoChangeLog-pr-13965.yml
deleted file mode 100644
index 69f5a90122..0000000000
--- a/html/changelogs/AutoChangeLog-pr-13965.yml
+++ /dev/null
@@ -1,7 +0,0 @@
-author: "Xantholne"
-delete-after: True
-changes:
- - rscadd: "You can now tuck disky into bed"
- - rscadd: "You can now make beds by applying a bed sheet to them"
- - rscadd: "You can now tuck in pai cards into bed"
- - rscadd: "Added bed tucking element, can be added to any held object to allow tucking into beds"
diff --git a/html/changelogs/AutoChangeLog-pr-13967.yml b/html/changelogs/AutoChangeLog-pr-13967.yml
deleted file mode 100644
index d2e580b531..0000000000
--- a/html/changelogs/AutoChangeLog-pr-13967.yml
+++ /dev/null
@@ -1,6 +0,0 @@
-author: "keronshb"
-delete-after: True
-changes:
- - balance: "Blob Resource Tower to 2 points per instead of 1 point per."
- - balance: "Blob Factory Towers can be placed 5 tiles apart instead of 7."
- - bugfix: "Fixes Blobbernaut Factories consuming Factories if no naut is chosen."
diff --git a/html/changelogs/AutoChangeLog-pr-13968.yml b/html/changelogs/AutoChangeLog-pr-13968.yml
deleted file mode 100644
index e3ce9e4615..0000000000
--- a/html/changelogs/AutoChangeLog-pr-13968.yml
+++ /dev/null
@@ -1,4 +0,0 @@
-author: "Arturlang"
-delete-after: True
-changes:
- - tweak: "Prayers to admins now do a wee ding sound for all prayers, instead of just chaplains"
diff --git a/html/changelogs/AutoChangeLog-pr-13970.yml b/html/changelogs/AutoChangeLog-pr-13970.yml
deleted file mode 100644
index 54d8d9992d..0000000000
--- a/html/changelogs/AutoChangeLog-pr-13970.yml
+++ /dev/null
@@ -1,8 +0,0 @@
-author: "TripleShades"
-delete-after: True
-changes:
- - rscadd: "Firelock to Surgery Bay drapes
-change: Swapped Nanomed and Fire Alarm button locations in both Surgery Bays
-change: Removes the double mirror in both Surgery Bays to be a singular mirror
-change: Moved an intercom to not be doorstuck below Paramedical Office
-remove: One Surgery Observation Fire Alarm button"
diff --git a/html/changelogs/AutoChangeLog-pr-13972.yml b/html/changelogs/AutoChangeLog-pr-13972.yml
deleted file mode 100644
index fdfdd4786d..0000000000
--- a/html/changelogs/AutoChangeLog-pr-13972.yml
+++ /dev/null
@@ -1,4 +0,0 @@
-author: "MrJWhit"
-delete-after: True
-changes:
- - tweak: "Fixes maint area in boxstation"
diff --git a/html/changelogs/AutoChangeLog-pr-13975.yml b/html/changelogs/AutoChangeLog-pr-13975.yml
deleted file mode 100644
index ff643cd19c..0000000000
--- a/html/changelogs/AutoChangeLog-pr-13975.yml
+++ /dev/null
@@ -1,4 +0,0 @@
-author: "zeroisthebiggay"
-delete-after: True
-changes:
- - imageadd: "fuck the r*d cr*ss"
diff --git a/html/changelogs/AutoChangeLog-pr-13976.yml b/html/changelogs/AutoChangeLog-pr-13976.yml
deleted file mode 100644
index dac85f8e9a..0000000000
--- a/html/changelogs/AutoChangeLog-pr-13976.yml
+++ /dev/null
@@ -1,4 +0,0 @@
-author: "timothyteakettle"
-delete-after: True
-changes:
- - rscadd: "you can teleport bread"
diff --git a/html/changelogs/AutoChangeLog-pr-13978.yml b/html/changelogs/AutoChangeLog-pr-13978.yml
deleted file mode 100644
index 94c19edec4..0000000000
--- a/html/changelogs/AutoChangeLog-pr-13978.yml
+++ /dev/null
@@ -1,4 +0,0 @@
-author: "silicons"
-delete-after: True
-changes:
- - balance: "c4 can no longer gib mobs"
diff --git a/html/changelogs/AutoChangeLog-pr-13980.yml b/html/changelogs/AutoChangeLog-pr-13980.yml
deleted file mode 100644
index 6838ba48a2..0000000000
--- a/html/changelogs/AutoChangeLog-pr-13980.yml
+++ /dev/null
@@ -1,4 +0,0 @@
-author: "MrJWhit"
-delete-after: True
-changes:
- - rscadd: "Makes gas sensors fireproof."
diff --git a/html/changelogs/AutoChangeLog-pr-13983.yml b/html/changelogs/AutoChangeLog-pr-13983.yml
deleted file mode 100644
index ba0bf62e6a..0000000000
--- a/html/changelogs/AutoChangeLog-pr-13983.yml
+++ /dev/null
@@ -1,6 +0,0 @@
-author: "shellspeed1"
-delete-after: True
-changes:
- - rscadd: "Xenomorph hybrids can now select wings
-~~add: Xenomorph hybrids can now speak xenomorph~~"
- - rscadd: "Xenomorph tongues are available for customization."
diff --git a/html/changelogs/AutoChangeLog-pr-13988.yml b/html/changelogs/AutoChangeLog-pr-13988.yml
deleted file mode 100644
index 262e5f804f..0000000000
--- a/html/changelogs/AutoChangeLog-pr-13988.yml
+++ /dev/null
@@ -1,4 +0,0 @@
-author: "DeltaFire15"
-delete-after: True
-changes:
- - bugfix: "Cargo packs marked as 'no private buying' now actually register as such."
diff --git a/html/changelogs/AutoChangeLog-pr-13993.yml b/html/changelogs/AutoChangeLog-pr-13993.yml
deleted file mode 100644
index d99ed0e0d1..0000000000
--- a/html/changelogs/AutoChangeLog-pr-13993.yml
+++ /dev/null
@@ -1,4 +0,0 @@
-author: "Arturlang"
-delete-after: True
-changes:
- - tweak: "The cursed heart now only takes away half as much blood every loop, and can be used as long as you are alive, instead if only you are awake/able to use your hands"
diff --git a/html/changelogs/AutoChangeLog-pr-13995.yml b/html/changelogs/AutoChangeLog-pr-13995.yml
deleted file mode 100644
index e58ee3103c..0000000000
--- a/html/changelogs/AutoChangeLog-pr-13995.yml
+++ /dev/null
@@ -1,4 +0,0 @@
-author: "DeltaFire15"
-delete-after: True
-changes:
- - bugfix: "Attacking some certain objects no longer has no clickdelay."
diff --git a/html/changelogs/AutoChangeLog-pr-13996.yml b/html/changelogs/AutoChangeLog-pr-13996.yml
deleted file mode 100644
index 5bea075460..0000000000
--- a/html/changelogs/AutoChangeLog-pr-13996.yml
+++ /dev/null
@@ -1,4 +0,0 @@
-author: "MrJWhit"
-delete-after: True
-changes:
- - tweak: "Bugfix of a morph becoming an AI eye"
diff --git a/html/changelogs/AutoChangeLog-pr-13997.yml b/html/changelogs/AutoChangeLog-pr-13997.yml
deleted file mode 100644
index 354f66010a..0000000000
--- a/html/changelogs/AutoChangeLog-pr-13997.yml
+++ /dev/null
@@ -1,4 +0,0 @@
-author: "MrJWhit"
-delete-after: True
-changes:
- - tweak: "Porting garbage collection tweak from /tg/"
diff --git a/html/changelogs/AutoChangeLog-pr-14001.yml b/html/changelogs/AutoChangeLog-pr-14001.yml
deleted file mode 100644
index 31c9e560ab..0000000000
--- a/html/changelogs/AutoChangeLog-pr-14001.yml
+++ /dev/null
@@ -1,4 +0,0 @@
-author: "MrJWhit"
-delete-after: True
-changes:
- - tweak: "Fixes two chairs on one table"
diff --git a/html/changelogs/AutoChangeLog-pr-14005.yml b/html/changelogs/AutoChangeLog-pr-14005.yml
deleted file mode 100644
index 253f4e137a..0000000000
--- a/html/changelogs/AutoChangeLog-pr-14005.yml
+++ /dev/null
@@ -1,4 +0,0 @@
-author: "DeltaFire15"
-delete-after: True
-changes:
- - bugfix: "Loot items mobs drop are no longer always failing to initialize."
diff --git a/html/changelogs/AutoChangeLog-pr-14006.yml b/html/changelogs/AutoChangeLog-pr-14006.yml
deleted file mode 100644
index 519ad32752..0000000000
--- a/html/changelogs/AutoChangeLog-pr-14006.yml
+++ /dev/null
@@ -1,4 +0,0 @@
-author: "DeltaFire15"
-delete-after: True
-changes:
- - bugfix: "Cyborg B.o.r.i.s. installation now checks for if the chest has a cell, just like how it does with MMIs."
diff --git a/html/changelogs/AutoChangeLog-pr-14007.yml b/html/changelogs/AutoChangeLog-pr-14007.yml
deleted file mode 100644
index 498aa6b807..0000000000
--- a/html/changelogs/AutoChangeLog-pr-14007.yml
+++ /dev/null
@@ -1,4 +0,0 @@
-author: "DeltaFire15"
-delete-after: True
-changes:
- - bugfix: "Antagging / Deantagging Heretics now properly sets their special role."
diff --git a/html/changelogs/AutoChangeLog-pr-14008.yml b/html/changelogs/AutoChangeLog-pr-14008.yml
deleted file mode 100644
index 836eefd99a..0000000000
--- a/html/changelogs/AutoChangeLog-pr-14008.yml
+++ /dev/null
@@ -1,4 +0,0 @@
-author: "TheSpaghetti"
-delete-after: True
-changes:
- - bugfix: "no more tumor bread double punctuation"
diff --git a/html/changelogs/AutoChangeLog-pr-14009.yml b/html/changelogs/AutoChangeLog-pr-14009.yml
deleted file mode 100644
index 03a1ca39dd..0000000000
--- a/html/changelogs/AutoChangeLog-pr-14009.yml
+++ /dev/null
@@ -1,7 +0,0 @@
-author: "shellspeed1"
-delete-after: True
-changes:
- - rscadd: "Wings from Cit RP have been ported over"
- - rscadd: "Moth wings from cit have been ported over"
- - bugfix: "Cleaned up some pixels on existing moth wings."
- - tweak: "Organized the lists for wings by if they are for moths or not and than by alphabetical."
diff --git a/html/changelogs/AutoChangeLog-pr-14010.yml b/html/changelogs/AutoChangeLog-pr-14010.yml
deleted file mode 100644
index 643f28dc99..0000000000
--- a/html/changelogs/AutoChangeLog-pr-14010.yml
+++ /dev/null
@@ -1,5 +0,0 @@
-author: "shellspeed1"
-delete-after: True
-changes:
- - rscadd: "The exofab can now print prosthetic limbs"
- - bugfix: "The exofab was missing access to multiple cybernetic organs. This has now been rectified."
diff --git a/html/changelogs/AutoChangeLog-pr-14014.yml b/html/changelogs/AutoChangeLog-pr-14014.yml
deleted file mode 100644
index ac29b1567b..0000000000
--- a/html/changelogs/AutoChangeLog-pr-14014.yml
+++ /dev/null
@@ -1,4 +0,0 @@
-author: "necromanceranne"
-delete-after: True
-changes:
- - bugfix: "Fixes various sprites for bokken, as well as being unable to craft certain parts and duplicate entries."
diff --git a/html/changelogs/AutoChangeLog-pr-14015.yml b/html/changelogs/AutoChangeLog-pr-14015.yml
deleted file mode 100644
index fe507d0a1e..0000000000
--- a/html/changelogs/AutoChangeLog-pr-14015.yml
+++ /dev/null
@@ -1,4 +0,0 @@
-author: "DeltaFire15"
-delete-after: True
-changes:
- - balance: "Some synth damage stuff has been a bit rebalanced, see the PR for details."
diff --git a/html/changelogs/AutoChangeLog-pr-14016.yml b/html/changelogs/AutoChangeLog-pr-14016.yml
deleted file mode 100644
index 1aab587190..0000000000
--- a/html/changelogs/AutoChangeLog-pr-14016.yml
+++ /dev/null
@@ -1,4 +0,0 @@
-author: "timothyteakettle"
-delete-after: True
-changes:
- - bugfix: "disabling adminhelp noises no longer disables looc"
diff --git a/html/changelogs/AutoChangeLog-pr-14019.yml b/html/changelogs/AutoChangeLog-pr-14019.yml
deleted file mode 100644
index 37bdd52948..0000000000
--- a/html/changelogs/AutoChangeLog-pr-14019.yml
+++ /dev/null
@@ -1,4 +0,0 @@
-author: "timothyteakettle"
-delete-after: True
-changes:
- - bugfix: "species with NOTRANSSTING cannot have envy's knife used on them"
diff --git a/html/changelogs/AutoChangeLog-pr-14021.yml b/html/changelogs/AutoChangeLog-pr-14021.yml
deleted file mode 100644
index aab94ae724..0000000000
--- a/html/changelogs/AutoChangeLog-pr-14021.yml
+++ /dev/null
@@ -1,4 +0,0 @@
-author: "DeltaFire15"
-delete-after: True
-changes:
- - bugfix: "Combat mode now will not stay permanently disabled due to status effects not working as intended."
diff --git a/html/changelogs/AutoChangeLog-pr-14025.yml b/html/changelogs/AutoChangeLog-pr-14025.yml
deleted file mode 100644
index 6db185baa3..0000000000
--- a/html/changelogs/AutoChangeLog-pr-14025.yml
+++ /dev/null
@@ -1,7 +0,0 @@
-author: "DeltaFire15"
-delete-after: True
-changes:
- - rscadd: "A new surgery, allowing revival of synths without a defib at hand."
- - balance: "Semi-permanent damage of Synth limbs caused by passing the damage threshold: 10 <- 15."
- - tweak: "The embed removal surgery now has a version for Synths."
- - balance: "EMPs no longer hardstun Synths."
diff --git a/html/changelogs/AutoChangeLog-pr-14026.yml b/html/changelogs/AutoChangeLog-pr-14026.yml
deleted file mode 100644
index 1ae9cb5c28..0000000000
--- a/html/changelogs/AutoChangeLog-pr-14026.yml
+++ /dev/null
@@ -1,4 +0,0 @@
-author: "BlueWildrose"
-delete-after: True
-changes:
- - bugfix: "Fixes noodle size appearance for 12+ inch members."
diff --git a/html/changelogs/AutoChangeLog-pr-14029.yml b/html/changelogs/AutoChangeLog-pr-14029.yml
deleted file mode 100644
index 2d4e0cdb17..0000000000
--- a/html/changelogs/AutoChangeLog-pr-14029.yml
+++ /dev/null
@@ -1,4 +0,0 @@
-author: "HeroWithYay"
-delete-after: True
-changes:
- - tweak: "Wormhole Projector and Gravity Gun now require anomaly cores to function instead of firing pins."
diff --git a/html/changelogs/AutoChangeLog-pr-14030.yml b/html/changelogs/AutoChangeLog-pr-14030.yml
deleted file mode 100644
index 9d4ee2647b..0000000000
--- a/html/changelogs/AutoChangeLog-pr-14030.yml
+++ /dev/null
@@ -1,4 +0,0 @@
-author: "Putnam3145"
-delete-after: True
-changes:
- - tweak: "Replaces majority judgement with usual judgement."
diff --git a/html/changelogs/AutoChangeLog-pr-14032.yml b/html/changelogs/AutoChangeLog-pr-14032.yml
deleted file mode 100644
index 67f0a80f83..0000000000
--- a/html/changelogs/AutoChangeLog-pr-14032.yml
+++ /dev/null
@@ -1,8 +0,0 @@
-author: "kappa-sama"
-delete-after: True
-changes:
- - rscadd: "A new spell for the wizard and his martial apprentices, the Inner Mantra technique. It makes you punch people really good and makes you durable, but drains your energy while it's active."
- - rscadd: "A self-buffing spell for valiant bubblegum slayers that is ultimately useless on lavaland and probably overpowered for miner antagonists. Go figure. At least all it does is let you punch hard while draining your health every second."
- - balance: "bubblegum now drops a book that makes you into an abusive father instead of a shotgun that plays like pre-nerf shotguns"
- - soundadd: "a powerup and powerdown sound effect"
- - imageadd: "two icons for two buff spells"
diff --git a/html/changelogs/AutoChangeLog-pr-14033.yml b/html/changelogs/AutoChangeLog-pr-14033.yml
deleted file mode 100644
index db6a6b0691..0000000000
--- a/html/changelogs/AutoChangeLog-pr-14033.yml
+++ /dev/null
@@ -1,4 +0,0 @@
-author: "BlueWildrose"
-delete-after: True
-changes:
- - rscadd: "Color Mates have been added to all stations (except Snaxi). Enjoy coloring your attire without having to bug science!"
diff --git a/html/changelogs/AutoChangeLog-pr-14034.yml b/html/changelogs/AutoChangeLog-pr-14034.yml
deleted file mode 100644
index ecd0d4ca10..0000000000
--- a/html/changelogs/AutoChangeLog-pr-14034.yml
+++ /dev/null
@@ -1,4 +0,0 @@
-author: "DeltaFire15"
-delete-after: True
-changes:
- - bugfix: "Some edge cases causing issues with system corruption shouldn't be able to occur anymore."
diff --git a/html/changelogs/AutoChangeLog-pr-14035.yml b/html/changelogs/AutoChangeLog-pr-14035.yml
deleted file mode 100644
index b8690368a3..0000000000
--- a/html/changelogs/AutoChangeLog-pr-14035.yml
+++ /dev/null
@@ -1,4 +0,0 @@
-author: "SiliconMain"
-delete-after: True
-changes:
- - tweak: "hololocks (which haven't worked for god knows how long) commented out until auxmos is merged"
diff --git a/html/changelogs/AutoChangeLog-pr-14036.yml b/html/changelogs/AutoChangeLog-pr-14036.yml
deleted file mode 100644
index a2bb654233..0000000000
--- a/html/changelogs/AutoChangeLog-pr-14036.yml
+++ /dev/null
@@ -1,4 +0,0 @@
-author: "BlueWildrose"
-delete-after: True
-changes:
- - tweak: "You will now only unbuckle fireman-carried/piggybacked people on disarm or harm intent."
diff --git a/html/changelogs/AutoChangeLog-pr-14037.yml b/html/changelogs/AutoChangeLog-pr-14037.yml
deleted file mode 100644
index b105b5e19a..0000000000
--- a/html/changelogs/AutoChangeLog-pr-14037.yml
+++ /dev/null
@@ -1,4 +0,0 @@
-author: "DeltaFire15"
-delete-after: True
-changes:
- - rscadd: "Nanogel, available at medical and robotics, which fixes internal damage in sufficiently repaired robotic limbs."
diff --git a/html/changelogs/AutoChangeLog-pr-14038.yml b/html/changelogs/AutoChangeLog-pr-14038.yml
deleted file mode 100644
index 906f6f7053..0000000000
--- a/html/changelogs/AutoChangeLog-pr-14038.yml
+++ /dev/null
@@ -1,9 +0,0 @@
-author: "Hatterhat"
-delete-after: True
-changes:
- - rscadd: "The nature interaction shuttle with the monkeys now has tiny fans on the airlocks in, because that's apparently a feature that was missing."
- - rscadd: "More bags have been added to department vendors."
- - balance: "Every roundstart species (and also ash walkers) now has flesh and bone that can be wounded."
- - balance: "Recipes for sutures, regen mesh, and sterilized gauze have been adjusted to be easier, mostly."
- - balance: "Sterilized gauze is better at absorbing blood and being a splint."
- - bugfix: "Energy sabres now have an off inhand."
diff --git a/html/changelogs/AutoChangeLog-pr-14039.yml b/html/changelogs/AutoChangeLog-pr-14039.yml
deleted file mode 100644
index a799003a02..0000000000
--- a/html/changelogs/AutoChangeLog-pr-14039.yml
+++ /dev/null
@@ -1,4 +0,0 @@
-author: "Hatterhat"
-delete-after: True
-changes:
- - rscadd: "Basic sticky technology is now a roundstart tech. Advanced sticky technology is BEPIS-locked, though. Theoretically."
diff --git a/html/changelogs/AutoChangeLog-pr-14040.yml b/html/changelogs/AutoChangeLog-pr-14040.yml
deleted file mode 100644
index 6202f0b3e1..0000000000
--- a/html/changelogs/AutoChangeLog-pr-14040.yml
+++ /dev/null
@@ -1,4 +0,0 @@
-author: "LetterN"
-delete-after: True
-changes:
- - bugfix: "fixed telecomms pda log"
diff --git a/html/changelogs/AutoChangeLog-pr-14042.yml b/html/changelogs/AutoChangeLog-pr-14042.yml
deleted file mode 100644
index a924ff582f..0000000000
--- a/html/changelogs/AutoChangeLog-pr-14042.yml
+++ /dev/null
@@ -1,4 +0,0 @@
-author: "kiwedespars"
-delete-after: True
-changes:
- - rscadd: "the robust dildo weapon now has sound."
diff --git a/html/changelogs/AutoChangeLog-pr-14043.yml b/html/changelogs/AutoChangeLog-pr-14043.yml
deleted file mode 100644
index 03a347724f..0000000000
--- a/html/changelogs/AutoChangeLog-pr-14043.yml
+++ /dev/null
@@ -1,4 +0,0 @@
-author: "timothyteakettle"
-delete-after: True
-changes:
- - rscadd: "licking people washes pie off their face"
diff --git a/html/changelogs/AutoChangeLog-pr-14044.yml b/html/changelogs/AutoChangeLog-pr-14044.yml
deleted file mode 100644
index e19b6266a7..0000000000
--- a/html/changelogs/AutoChangeLog-pr-14044.yml
+++ /dev/null
@@ -1,4 +0,0 @@
-author: "corin9090"
-delete-after: True
-changes:
- - tweak: "The chaplain's prayer beads can now be worn on your belt slot"
diff --git a/html/changelogs/AutoChangeLog-pr-14048.yml b/html/changelogs/AutoChangeLog-pr-14048.yml
deleted file mode 100644
index b7b1448b37..0000000000
--- a/html/changelogs/AutoChangeLog-pr-14048.yml
+++ /dev/null
@@ -1,4 +0,0 @@
-author: "MrJWhit"
-delete-after: True
-changes:
- - tweak: "Updates suit storage info on Tip Of the Round."
diff --git a/html/changelogs/AutoChangeLog-pr-14054.yml b/html/changelogs/AutoChangeLog-pr-14054.yml
deleted file mode 100644
index 406e6b2713..0000000000
--- a/html/changelogs/AutoChangeLog-pr-14054.yml
+++ /dev/null
@@ -1,5 +0,0 @@
-author: "TheObserver"
-delete-after: True
-changes:
- - rscadd: "Re-adds the rifle stock, and sets the improv shotgun to be as it was."
- - rscdel: "The maintenance rifle has been shelved - for now. Watch this space."
diff --git a/html/changelogs/AutoChangeLog-pr-14055.yml b/html/changelogs/AutoChangeLog-pr-14055.yml
deleted file mode 100644
index 95baa857fa..0000000000
--- a/html/changelogs/AutoChangeLog-pr-14055.yml
+++ /dev/null
@@ -1,4 +0,0 @@
-author: "BlueWildrose"
-delete-after: True
-changes:
- - tweak: "No more straining when your cock or breasts are growing via incubus draft or succubus milk."
diff --git a/html/changelogs/AutoChangeLog-pr-14060.yml b/html/changelogs/AutoChangeLog-pr-14060.yml
deleted file mode 100644
index f9750fc9be..0000000000
--- a/html/changelogs/AutoChangeLog-pr-14060.yml
+++ /dev/null
@@ -1,4 +0,0 @@
-author: "Hatterhat"
-delete-after: True
-changes:
- - rscdel: "Apparently, shrink rays were buyable again, despite a PR having been made a while ago specifically for removing shrink rays. They're gone again."
diff --git a/html/changelogs/AutoChangeLog-pr-14061.yml b/html/changelogs/AutoChangeLog-pr-14061.yml
deleted file mode 100644
index c10eded1df..0000000000
--- a/html/changelogs/AutoChangeLog-pr-14061.yml
+++ /dev/null
@@ -1,5 +0,0 @@
-author: "Hatterhat"
-delete-after: True
-changes:
- - tweak: "Improvised gauzes can now be crafted in stacks up to 10, like their maximum stacksize implies they should be capable of doing."
- - bugfix: "Pouring sterilizine on gauze now takes the proper 5u per sterilized gauze instead of 10u."
diff --git a/html/changelogs/AutoChangeLog-pr-14062.yml b/html/changelogs/AutoChangeLog-pr-14062.yml
deleted file mode 100644
index 84e40850ec..0000000000
--- a/html/changelogs/AutoChangeLog-pr-14062.yml
+++ /dev/null
@@ -1,4 +0,0 @@
-author: "kappa-sama"
-delete-after: True
-changes:
- - bugfix: "super saiyan"
diff --git a/html/changelogs/AutoChangeLog-pr-14065.yml b/html/changelogs/AutoChangeLog-pr-14065.yml
deleted file mode 100644
index 96a0a7cb3a..0000000000
--- a/html/changelogs/AutoChangeLog-pr-14065.yml
+++ /dev/null
@@ -1,4 +0,0 @@
-author: "MrJWhit"
-delete-after: True
-changes:
- - tweak: "A small bucket of random fixes,"
diff --git a/html/changelogs/AutoChangeLog-pr-14070.yml b/html/changelogs/AutoChangeLog-pr-14070.yml
deleted file mode 100644
index f9a694c6ff..0000000000
--- a/html/changelogs/AutoChangeLog-pr-14070.yml
+++ /dev/null
@@ -1,4 +0,0 @@
-author: "YakumoChen"
-delete-after: True
-changes:
- - balance: "To lower production costs, Buzz Fuzz is now manufactured with Real™️ Synthetic honey."
diff --git a/html/changelogs/AutoChangeLog-pr-14082.yml b/html/changelogs/AutoChangeLog-pr-14082.yml
deleted file mode 100644
index c65f417894..0000000000
--- a/html/changelogs/AutoChangeLog-pr-14082.yml
+++ /dev/null
@@ -1,7 +0,0 @@
-author: "kappa-sama"
-delete-after: True
-changes:
- - rscadd: "s"
- - tweak: "s"
- - balance: "s"
- - bugfix: "s"
diff --git a/html/changelogs/AutoChangeLog-pr-14089.yml b/html/changelogs/AutoChangeLog-pr-14089.yml
deleted file mode 100644
index 4a473d6fa7..0000000000
--- a/html/changelogs/AutoChangeLog-pr-14089.yml
+++ /dev/null
@@ -1,4 +0,0 @@
-author: "MrJWhit"
-delete-after: True
-changes:
- - tweak: "Mining station oxygen locker on the cycling airlock starts out wrenched."
diff --git a/html/changelogs/AutoChangeLog-pr-14256.yml b/html/changelogs/AutoChangeLog-pr-14256.yml
new file mode 100644
index 0000000000..2515417160
--- /dev/null
+++ b/html/changelogs/AutoChangeLog-pr-14256.yml
@@ -0,0 +1,5 @@
+author: "Adelphon"
+delete-after: True
+changes:
+ - rscadd: "polychromic pants"
+ - tweak: "urban coat made polychromic"
diff --git a/icons/effects/footprints.dmi b/icons/effects/footprints.dmi
index 69207097c0..3e00a4a080 100644
Binary files a/icons/effects/footprints.dmi and b/icons/effects/footprints.dmi differ
diff --git a/icons/mob/clothing/accessories.dmi b/icons/mob/clothing/accessories.dmi
index 743ed03f48..3d1f58743c 100644
Binary files a/icons/mob/clothing/accessories.dmi and b/icons/mob/clothing/accessories.dmi differ
diff --git a/icons/mob/clothing/custom_w.dmi b/icons/mob/clothing/custom_w.dmi
index 10f7c5080a..440e5aefe6 100644
Binary files a/icons/mob/clothing/custom_w.dmi and b/icons/mob/clothing/custom_w.dmi differ
diff --git a/icons/mob/clothing/feet.dmi b/icons/mob/clothing/feet.dmi
index 67d1849ef6..d93543805b 100644
Binary files a/icons/mob/clothing/feet.dmi and b/icons/mob/clothing/feet.dmi differ
diff --git a/icons/mob/clothing/feet_digi.dmi b/icons/mob/clothing/feet_digi.dmi
index f798850ee7..43244e99b9 100644
Binary files a/icons/mob/clothing/feet_digi.dmi and b/icons/mob/clothing/feet_digi.dmi differ
diff --git a/icons/mob/clothing/hands.dmi b/icons/mob/clothing/hands.dmi
index b95c377e12..406b0fe62a 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 4b0c56c4d2..23b981031c 100644
Binary files a/icons/mob/clothing/head.dmi and b/icons/mob/clothing/head.dmi differ
diff --git a/icons/mob/clothing/mask.dmi b/icons/mob/clothing/mask.dmi
index ecc6e2dd2c..7d9433525a 100644
Binary files a/icons/mob/clothing/mask.dmi and b/icons/mob/clothing/mask.dmi differ
diff --git a/icons/mob/clothing/mask_muzzled.dmi b/icons/mob/clothing/mask_muzzled.dmi
index a1404cfbce..8ca05969bf 100644
Binary files a/icons/mob/clothing/mask_muzzled.dmi and b/icons/mob/clothing/mask_muzzled.dmi differ
diff --git a/icons/mob/clothing/neck.dmi b/icons/mob/clothing/neck.dmi
index 084a2c3649..3214cc73ba 100644
Binary files a/icons/mob/clothing/neck.dmi and b/icons/mob/clothing/neck.dmi differ
diff --git a/icons/mob/clothing/suit.dmi b/icons/mob/clothing/suit.dmi
index 6098b8342a..dadb2ea963 100644
Binary files a/icons/mob/clothing/suit.dmi and b/icons/mob/clothing/suit.dmi differ
diff --git a/icons/mob/clothing/suit_digi.dmi b/icons/mob/clothing/suit_digi.dmi
index 5c361feb5f..f80cb4a426 100644
Binary files a/icons/mob/clothing/suit_digi.dmi and b/icons/mob/clothing/suit_digi.dmi differ
diff --git a/icons/mob/clothing/underwear.dmi b/icons/mob/clothing/underwear.dmi
index 8cf1144a68..71461e21e8 100644
Binary files a/icons/mob/clothing/underwear.dmi and b/icons/mob/clothing/underwear.dmi differ
diff --git a/icons/mob/clothing/uniform.dmi b/icons/mob/clothing/uniform.dmi
index 7bd7de82c7..325f04cede 100644
Binary files a/icons/mob/clothing/uniform.dmi and b/icons/mob/clothing/uniform.dmi differ
diff --git a/icons/mob/clothing/uniform_digi.dmi b/icons/mob/clothing/uniform_digi.dmi
index 61c464ef1d..98ec436b86 100644
Binary files a/icons/mob/clothing/uniform_digi.dmi and b/icons/mob/clothing/uniform_digi.dmi differ
diff --git a/icons/mob/hair.dmi b/icons/mob/hair.dmi
index 6dfa78fcff..6ecaad55a5 100644
Binary files a/icons/mob/hair.dmi and b/icons/mob/hair.dmi differ
diff --git a/icons/mob/inhands/64x64_lefthand.dmi b/icons/mob/inhands/64x64_lefthand.dmi
index 6dc8d82753..95106e3dbf 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 ca87f74a6f..2c1909108b 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/items_lefthand.dmi b/icons/mob/inhands/items_lefthand.dmi
index 0a82845910..6f747f1265 100644
Binary files a/icons/mob/inhands/items_lefthand.dmi and b/icons/mob/inhands/items_lefthand.dmi differ
diff --git a/icons/mob/inhands/items_righthand.dmi b/icons/mob/inhands/items_righthand.dmi
index abfbb18f84..af14ba7784 100644
Binary files a/icons/mob/inhands/items_righthand.dmi and b/icons/mob/inhands/items_righthand.dmi differ
diff --git a/icons/mob/inhands/weapons/swords_righthand.dmi b/icons/mob/inhands/weapons/swords_righthand.dmi
index 8716c3627f..e5c3c2f5c9 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/radial.dmi b/icons/mob/radial.dmi
index cfdd0e549a..e681069131 100644
Binary files a/icons/mob/radial.dmi and b/icons/mob/radial.dmi differ
diff --git a/icons/obj/card.dmi b/icons/obj/card.dmi
index 13a0725b05..1bd94f2424 100644
Binary files a/icons/obj/card.dmi and b/icons/obj/card.dmi differ
diff --git a/icons/obj/clothing/accessories.dmi b/icons/obj/clothing/accessories.dmi
index 510adc97b4..e452ca687b 100644
Binary files a/icons/obj/clothing/accessories.dmi and b/icons/obj/clothing/accessories.dmi differ
diff --git a/icons/obj/clothing/belt_overlays.dmi b/icons/obj/clothing/belt_overlays.dmi
index 1178588ee7..5f31a65ffa 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/cloaks.dmi b/icons/obj/clothing/cloaks.dmi
index cc5f4f3392..90997bf80a 100644
Binary files a/icons/obj/clothing/cloaks.dmi and b/icons/obj/clothing/cloaks.dmi differ
diff --git a/icons/obj/clothing/gloves.dmi b/icons/obj/clothing/gloves.dmi
index 0feb6a75db..629b989520 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 ee6cf90597..9fa3e527ca 100644
Binary files a/icons/obj/clothing/hats.dmi and b/icons/obj/clothing/hats.dmi differ
diff --git a/icons/obj/clothing/masks.dmi b/icons/obj/clothing/masks.dmi
index 106195e968..acd64bb424 100644
Binary files a/icons/obj/clothing/masks.dmi and b/icons/obj/clothing/masks.dmi differ
diff --git a/icons/obj/clothing/neck.dmi b/icons/obj/clothing/neck.dmi
index c4c9c94f48..d7e0c9c24b 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 d3e4c0f7e9..aee67da199 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 6ddac703a0..da3dbe6115 100644
Binary files a/icons/obj/clothing/suits.dmi and b/icons/obj/clothing/suits.dmi differ
diff --git a/icons/obj/clothing/uniforms.dmi b/icons/obj/clothing/uniforms.dmi
index 17e52b60c9..4ad3d4124f 100644
Binary files a/icons/obj/clothing/uniforms.dmi and b/icons/obj/clothing/uniforms.dmi differ
diff --git a/icons/obj/custom.dmi b/icons/obj/custom.dmi
index 77b2d114b9..a768e6a35d 100644
Binary files a/icons/obj/custom.dmi and b/icons/obj/custom.dmi differ
diff --git a/icons/obj/guns/energy.dmi b/icons/obj/guns/energy.dmi
index 7e7e4a644b..158c95ee5d 100644
Binary files a/icons/obj/guns/energy.dmi and b/icons/obj/guns/energy.dmi differ
diff --git a/icons/obj/items_and_weapons.dmi b/icons/obj/items_and_weapons.dmi
index 119e612c40..978ffbda27 100644
Binary files a/icons/obj/items_and_weapons.dmi and b/icons/obj/items_and_weapons.dmi differ
diff --git a/icons/obj/projectiles.dmi b/icons/obj/projectiles.dmi
index 94568b8633..740c64b1dc 100644
Binary files a/icons/obj/projectiles.dmi and b/icons/obj/projectiles.dmi differ
diff --git a/icons/obj/smith.dmi b/icons/obj/smith.dmi
index cbd6b9e85e..19e12dec86 100644
Binary files a/icons/obj/smith.dmi and b/icons/obj/smith.dmi differ
diff --git a/icons/obj/tcg/misc.dmi b/icons/obj/tcg/misc.dmi
new file mode 100644
index 0000000000..0fc4d3ecce
Binary files /dev/null and b/icons/obj/tcg/misc.dmi differ
diff --git a/icons/obj/tcg/pack_1.dmi b/icons/obj/tcg/pack_1.dmi
new file mode 100644
index 0000000000..1a9952b91b
Binary files /dev/null and b/icons/obj/tcg/pack_1.dmi differ
diff --git a/icons/obj/tcg/pack_nuclear.dmi b/icons/obj/tcg/pack_nuclear.dmi
new file mode 100644
index 0000000000..84f94890ef
Binary files /dev/null and b/icons/obj/tcg/pack_nuclear.dmi differ
diff --git a/icons/obj/tcg/pack_star.dmi b/icons/obj/tcg/pack_star.dmi
new file mode 100644
index 0000000000..273f4c62ef
Binary files /dev/null and b/icons/obj/tcg/pack_star.dmi differ
diff --git a/modular_citadel/code/modules/client/loadout/__donator.dm b/modular_citadel/code/modules/client/loadout/__donator.dm
index d58dda7f7d..ec4ec38015 100644
--- a/modular_citadel/code/modules/client/loadout/__donator.dm
+++ b/modular_citadel/code/modules/client/loadout/__donator.dm
@@ -537,4 +537,9 @@
path = /obj/item/clothing/suit/custom/exo
ckeywhitelist = list("jesterz7")
+/datum/gear/donator/choker
+ name = "NT Choker"
+ slot = SLOT_NECK
+ path = /obj/item/clothing/neck/petcollar/choker
+ ckeywhitelist = list("trigillass")
diff --git a/modular_citadel/code/modules/client/loadout/_loadout.dm b/modular_citadel/code/modules/client/loadout/_loadout.dm
index 2a7b77bd47..5f895c4805 100644
--- a/modular_citadel/code/modules/client/loadout/_loadout.dm
+++ b/modular_citadel/code/modules/client/loadout/_loadout.dm
@@ -53,7 +53,7 @@ GLOBAL_LIST_EMPTY(loadout_whitelist_ids)
var/path //item-to-spawn path
var/cost = 1 //normally, each loadout costs a single point.
var/geargroupID //defines the ID that the gear inherits from the config
- var/loadout_flags = 0
+ var/loadout_flags = LOADOUT_CAN_NAME | LOADOUT_CAN_DESCRIPTION
var/list/loadout_initial_colors = list()
//NEW DONATOR SYTSEM STUFF
diff --git a/modular_citadel/code/modules/client/loadout/head.dm b/modular_citadel/code/modules/client/loadout/head.dm
index fd03e2279f..d1c2c69b99 100644
--- a/modular_citadel/code/modules/client/loadout/head.dm
+++ b/modular_citadel/code/modules/client/loadout/head.dm
@@ -15,6 +15,18 @@
name = "Black beret"
path = /obj/item/clothing/head/beret/black
+/datum/gear/head/redberet
+ name = "Red beret"
+ path = /obj/item/clothing/head/beret
+
+/datum/gear/head/purpleberet
+ name = "Purple beret"
+ path = /obj/item/clothing/head/beret/purple
+
+/datum/gear/head/blueberet
+ name = "Blue beret"
+ path = /obj/item/clothing/head/beret/blue
+
/datum/gear/head/flatcap
name = "Flat cap"
path = /obj/item/clothing/head/flatcap
diff --git a/modular_citadel/code/modules/client/loadout/mask.dm b/modular_citadel/code/modules/client/loadout/mask.dm
index 9468c9303d..576b29cddc 100644
--- a/modular_citadel/code/modules/client/loadout/mask.dm
+++ b/modular_citadel/code/modules/client/loadout/mask.dm
@@ -20,3 +20,14 @@
path = /obj/item/clothing/mask/gas
cost = 2
restricted_roles = list("Chief Engineer", "Atmospheric Technician", "Station Engineer") //*shrug
+
+/datum/gear/mask/sterile
+ name = "Aesthetic sterile mask"
+ path = /obj/item/clothing/mask/surgical/aesthetic
+ cost = 2
+
+/datum/gear/mask/paper
+ name = "Paper mask"
+ path = /obj/item/clothing/mask/paper
+ cost = 2
+
diff --git a/modular_citadel/code/modules/client/loadout/neck.dm b/modular_citadel/code/modules/client/loadout/neck.dm
index 7c3c11f25c..7c9bafc86d 100644
--- a/modular_citadel/code/modules/client/loadout/neck.dm
+++ b/modular_citadel/code/modules/client/loadout/neck.dm
@@ -30,6 +30,10 @@
name = "Choker"
path = /obj/item/clothing/neck/petcollar/choker
+/datum/gear/neck/cowbell
+ name = "Cowbell collar"
+ path = /obj/item/clothing/neck/necklace/cowbell
+
/datum/gear/neck/scarf
name = "White scarf"
subcategory = LOADOUT_SUBCATEGORY_NECK_SCARVES
@@ -86,7 +90,7 @@
/datum/gear/neck/polycloak
name = "Polychromatic Cloak"
path = /obj/item/clothing/neck/cloak/polychromic
- loadout_flags = LOADOUT_CAN_COLOR_POLYCHROMIC
+ loadout_flags = LOADOUT_CAN_NAME | LOADOUT_CAN_DESCRIPTION | LOADOUT_CAN_COLOR_POLYCHROMIC
loadout_initial_colors = list("#FFFFFF", "#FFFFFF", "#808080")
/datum/gear/neck/altpolycloak
@@ -94,3 +98,9 @@
path = /obj/item/clothing/neck/cloak/alt/polychromic
loadout_flags = LOADOUT_CAN_COLOR_POLYCHROMIC
loadout_initial_colors = list("#FFFFFF", "#676767", "#4C4C4C")
+
+/datum/gear/neck/cancloak
+ name = "Canvas Cloak"
+ path = /obj/item/clothing/neck/cancloak/polychromic
+ loadout_flags = LOADOUT_CAN_NAME | LOADOUT_CAN_DESCRIPTION | LOADOUT_CAN_COLOR_POLYCHROMIC
+ loadout_initial_colors = list("#585858", "#373737", "#BEBEBE")
diff --git a/modular_citadel/code/modules/client/loadout/shoes.dm b/modular_citadel/code/modules/client/loadout/shoes.dm
index 76d7305971..e2b3916ae0 100644
--- a/modular_citadel/code/modules/client/loadout/shoes.dm
+++ b/modular_citadel/code/modules/client/loadout/shoes.dm
@@ -34,6 +34,12 @@
name = "White shoes"
path = /obj/item/clothing/shoes/sneakers/white
+/datum/gear/shoes/poly
+ name = "Polychromic shoes"
+ path = /obj/item/clothing/shoes/sneakers/poly/polychromic
+ loadout_flags = LOADOUT_CAN_NAME | LOADOUT_CAN_DESCRIPTION | LOADOUT_CAN_COLOR_POLYCHROMIC
+ loadout_initial_colors = list("#FFFFFF", "#1D1D1D")
+
/datum/gear/shoes/gildedcuffs
name = "Gilded leg wraps"
path= /obj/item/clothing/shoes/wraps
diff --git a/modular_citadel/code/modules/client/loadout/suit.dm b/modular_citadel/code/modules/client/loadout/suit.dm
index 7c21ed84d0..52e83aee32 100644
--- a/modular_citadel/code/modules/client/loadout/suit.dm
+++ b/modular_citadel/code/modules/client/loadout/suit.dm
@@ -101,9 +101,16 @@
name = "Polychromic winter coat"
path = /obj/item/clothing/suit/hooded/wintercoat/polychromic
cost = 4 //too many people with neon green coats is hard on the eyes
- loadout_flags = LOADOUT_CAN_COLOR_POLYCHROMIC
+ loadout_flags = LOADOUT_CAN_NAME | LOADOUT_CAN_DESCRIPTION | LOADOUT_CAN_COLOR_POLYCHROMIC
loadout_initial_colors = list("#6A6964", "#C4B8A6", "#0000FF")
+/datum/gear/suit/coat/wbreakpoly
+ name = "Polychromic windbreaker"
+ path = /obj/item/clothing/suit/toggle/wbreakpoly/polychromic
+ cost = 4
+ loadout_flags = LOADOUT_CAN_NAME | LOADOUT_CAN_DESCRIPTION | LOADOUT_CAN_COLOR_POLYCHROMIC
+ loadout_initial_colors = list("#464F65", "#916035", "#474747")
+
/datum/gear/suit/coat/med
name = "Medical winter coat"
path = /obj/item/clothing/suit/hooded/wintercoat/medical
@@ -159,6 +166,13 @@
path = /obj/item/clothing/suit/jacket/miljacket
subcategory = LOADOUT_SUBCATEGORY_SUIT_JACKETS
+/datum/gear/suit/urbanjacket
+ name = "Urban Jacket"
+ path = /obj/item/clothing/suit/jacket/urbanjacket/polychromic
+ subcategory = LOADOUT_SUBCATEGORY_SUIT_JACKETS
+ loadout_flags = LOADOUT_CAN_NAME | LOADOUT_CAN_DESCRIPTION | LOADOUT_CAN_COLOR_POLYCHROMIC
+ loadout_initial_colors = list("#26321D", "#CBBDAF", "#292929")
+
/datum/gear/suit/ianshirt
name = "Ian Shirt"
path = /obj/item/clothing/suit/ianshirt
diff --git a/modular_citadel/code/modules/client/loadout/uniform.dm b/modular_citadel/code/modules/client/loadout/uniform.dm
index b76e223f25..1484f257a4 100644
--- a/modular_citadel/code/modules/client/loadout/uniform.dm
+++ b/modular_citadel/code/modules/client/loadout/uniform.dm
@@ -32,6 +32,10 @@
name = "Tan suit"
path = /obj/item/clothing/under/suit/tan
+/datum/gear/uniform/suit/charismatic_suit
+ name = "Charismatic suit"
+ path = /obj/item/clothing/under/suit/charismatic_suit
+
/datum/gear/uniform/suit/white
name = "White suit"
path = /obj/item/clothing/under/suit/white
@@ -47,7 +51,7 @@
/datum/gear/uniform/maidcostume/polychromic
name = "Polychromic maid costume"
path = /obj/item/clothing/under/rank/civilian/janitor/maid/polychromic
- loadout_flags = LOADOUT_CAN_COLOR_POLYCHROMIC
+ loadout_flags = LOADOUT_CAN_NAME | LOADOUT_CAN_DESCRIPTION | LOADOUT_CAN_COLOR_POLYCHROMIC
loadout_initial_colors = list("#FFFFFF", "#000000")
/datum/gear/uniform/mailmanuniform
@@ -166,6 +170,13 @@
name = "Tan Pants"
path = /obj/item/clothing/under/pants/tan
+/datum/gear/uniform/pants/polypants
+ name = "Polychromic Pants"
+ path = /obj/item/clothing/under/pants/polypants/polychromic
+ cost = 2
+ loadout_flags = LOADOUT_CAN_NAME | LOADOUT_CAN_DESCRIPTION | LOADOUT_CAN_COLOR_POLYCHROMIC
+ loadout_initial_colors = list("#75634F", "#3D3D3D", "#575757")
+
/datum/gear/uniform/pants/track
name = "Track Pants"
path = /obj/item/clothing/under/pants/track
@@ -229,49 +240,49 @@
name = "Polychromic Jumpsuit"
path = /obj/item/clothing/under/misc/polyjumpsuit
cost = 2
- loadout_flags = LOADOUT_CAN_COLOR_POLYCHROMIC
+ loadout_flags = LOADOUT_CAN_NAME | LOADOUT_CAN_DESCRIPTION | LOADOUT_CAN_COLOR_POLYCHROMIC
loadout_initial_colors = list("#FFFFFF", "#808080", "#353535")
/datum/gear/uniform/skirt/poly
name = "Polychromic Jumpskirt"
path = /obj/item/clothing/under/dress/skirt/polychromic
cost = 2
- loadout_flags = LOADOUT_CAN_COLOR_POLYCHROMIC
+ loadout_flags = LOADOUT_CAN_NAME | LOADOUT_CAN_DESCRIPTION | LOADOUT_CAN_COLOR_POLYCHROMIC
loadout_initial_colors = list("#FFFFFF", "#F08080", "#808080")
/datum/gear/uniform/suit/poly
name = "Polychromic Button-up Shirt"
path = /obj/item/clothing/under/misc/poly_shirt
cost = 3
- loadout_flags = LOADOUT_CAN_COLOR_POLYCHROMIC
+ loadout_flags = LOADOUT_CAN_NAME | LOADOUT_CAN_DESCRIPTION | LOADOUT_CAN_COLOR_POLYCHROMIC
loadout_initial_colors = list("#FFFFFF", "#353535", "#353535")
/datum/gear/uniform/skirt/poly/pleated
name = "Polychromic Pleated Sweaterskirt"
path = /obj/item/clothing/under/dress/skirt/polychromic/pleated
cost = 3
- loadout_flags = LOADOUT_CAN_COLOR_POLYCHROMIC
+ loadout_flags = LOADOUT_CAN_NAME | LOADOUT_CAN_DESCRIPTION | LOADOUT_CAN_COLOR_POLYCHROMIC
loadout_initial_colors = list("#8CC6FF", "#808080", "#FF3535")
/datum/gear/uniform/polykilt
name = "Polychromic Kilt"
path = /obj/item/clothing/under/costume/kilt/polychromic
cost = 3
- loadout_flags = LOADOUT_CAN_COLOR_POLYCHROMIC
+ loadout_flags = LOADOUT_CAN_NAME | LOADOUT_CAN_DESCRIPTION | LOADOUT_CAN_COLOR_POLYCHROMIC
loadout_initial_colors = list("#FFFFFF", "#F08080")
/datum/gear/uniform/shorts/poly
name = "Polychromic Shorts"
path = /obj/item/clothing/under/misc/polyshorts
cost = 3
- loadout_flags = LOADOUT_CAN_COLOR_POLYCHROMIC
+ loadout_flags = LOADOUT_CAN_NAME | LOADOUT_CAN_DESCRIPTION | LOADOUT_CAN_COLOR_POLYCHROMIC
loadout_initial_colors = list("#353535", "#808080", "#808080")
/datum/gear/uniform/shorts/poly/athletic
name = "Polychromic Athletic Shorts"
path = /obj/item/clothing/under/shorts/polychromic
cost = 2
- loadout_flags = LOADOUT_CAN_COLOR_POLYCHROMIC
+ loadout_flags = LOADOUT_CAN_NAME | LOADOUT_CAN_DESCRIPTION | LOADOUT_CAN_COLOR_POLYCHROMIC
loadout_initial_colors = list("#FFFFFF", "#F08080")
/datum/gear/uniform/hopcasual
diff --git a/modular_citadel/code/modules/clothing/trek.dm b/modular_citadel/code/modules/clothing/trek.dm
index f7e8b6778e..dd02a6d0f8 100644
--- a/modular_citadel/code/modules/clothing/trek.dm
+++ b/modular_citadel/code/modules/clothing/trek.dm
@@ -51,58 +51,58 @@
blood_overlay_type = "coat"
body_parts_covered = CHEST|GROIN|ARMS
allowed = list(
- /obj/item/tank/internals/emergency_oxygen,
- /obj/item/flashlight,
- /obj/item/analyzer,
- /obj/item/radio,
- /obj/item/gun,
- /obj/item/melee/baton,
- /obj/item/restraints/handcuffs,
- /obj/item/reagent_containers/hypospray,
- /obj/item/hypospray,
- /obj/item/healthanalyzer,
- /obj/item/reagent_containers/syringe,
- /obj/item/reagent_containers/glass/bottle/vial,
- /obj/item/reagent_containers/glass/beaker,
- /obj/item/storage/pill_bottle,
- /obj/item/taperecorder)
+ /obj/item/tank/internals/emergency_oxygen,
+ /obj/item/flashlight,
+ /obj/item/analyzer,
+ /obj/item/radio,
+ /obj/item/gun,
+ /obj/item/melee/baton,
+ /obj/item/restraints/handcuffs,
+ /obj/item/reagent_containers/hypospray,
+ /obj/item/hypospray,
+ /obj/item/healthanalyzer,
+ /obj/item/reagent_containers/syringe,
+ /obj/item/reagent_containers/glass/bottle/vial,
+ /obj/item/reagent_containers/glass/beaker,
+ /obj/item/storage/pill_bottle,
+ /obj/item/taperecorder)
armor = list("melee" = 0, "bullet" = 0, "laser" = 0,"energy" = 0, "bomb" = 0, "bio" = 0, "rad" = 0, "fire" = 0, "acid" = 0)
- var/unbuttoned = 0
+ var/unbuttoned = FALSE
- verb/toggle()
- set name = "Toggle coat buttons"
- set category = "Object"
- set src in usr
+/obj/item/clothing/suit/storage/fluff/fedcoat/verb/toggle()
+ set name = "Toggle coat buttons"
+ set category = "Object"
+ set src in usr
- var/mob/living/L = usr
- if(!istype(L) || !CHECK_MOBILITY(L, MOBILITY_USE))
- return FALSE
+ var/mob/living/L = usr
+ if(!istype(L) || !CHECK_MOBILITY(L, MOBILITY_USE))
+ return FALSE
- switch(unbuttoned)
- if(0)
- icon_state = "[initial(icon_state)]_open"
- item_state = "[initial(item_state)]_open"
- unbuttoned = 1
- to_chat(usr,"You unbutton the coat.")
- if(1)
- icon_state = "[initial(icon_state)]"
- item_state = "[initial(item_state)]"
- unbuttoned = 0
- to_chat(usr,"You button up the coat.")
- usr.update_inv_wear_suit()
+ switch(unbuttoned)
+ if(FALSE)
+ icon_state = "[initial(icon_state)]_open"
+ item_state = "[initial(item_state)]_open"
+ unbuttoned = TRUE
+ to_chat(usr,"You unbutton the coat.")
+ if(TRUE)
+ icon_state = "[initial(icon_state)]"
+ item_state = "[initial(item_state)]"
+ unbuttoned = FALSE
+ to_chat(usr,"You button up the coat.")
+ usr.update_inv_wear_suit()
- //Variants
+//Variants
/obj/item/clothing/suit/storage/fluff/fedcoat/medsci
- icon_state = "fedblue"
- item_state = "fedblue"
+ icon_state = "fedblue"
+ item_state = "fedblue"
/obj/item/clothing/suit/storage/fluff/fedcoat/eng
- icon_state = "fedeng"
- item_state = "fedeng"
+ icon_state = "fedeng"
+ item_state = "fedeng"
/obj/item/clothing/suit/storage/fluff/fedcoat/capt
- icon_state = "fedcapt"
- item_state = "fedcapt"
+ icon_state = "fedcapt"
+ item_state = "fedcapt"
//"modern" ones for fancy
@@ -124,18 +124,18 @@
)
armor = list("melee" = 0, "bullet" = 0, "laser" = 0,"energy" = 0, "bomb" = 0, "bio" = 0, "rad" = 0, "fire" = 0, "acid" = 0)
- //Variants
+//Variants
/obj/item/clothing/suit/storage/fluff/modernfedcoat/medsci
- icon_state = "fedmodernblue"
- item_state = "fedmodernblue"
+ icon_state = "fedmodernblue"
+ item_state = "fedmodernblue"
/obj/item/clothing/suit/storage/fluff/modernfedcoat/eng
- icon_state = "fedmoderneng"
- item_state = "fedmoderneng"
+ icon_state = "fedmoderneng"
+ item_state = "fedmoderneng"
/obj/item/clothing/suit/storage/fluff/modernfedcoat/sec
- icon_state = "fedmodernsec"
- item_state = "fedmodernsec"
+ icon_state = "fedmodernsec"
+ item_state = "fedmodernsec"
/obj/item/clothing/head/caphat/formal/fedcover
name = "Federation Officer's Cap"
@@ -146,22 +146,22 @@
mob_overlay_icon = 'modular_citadel/icons/mob/clothing/trek_mob_icon.dmi'
item_state = "fedcapofficer"
- //Variants
+//Variants
/obj/item/clothing/head/caphat/formal/fedcover/medsci
- icon_state = "fedcapsci"
- item_state = "fedcapsci"
+ icon_state = "fedcapsci"
+ item_state = "fedcapsci"
/obj/item/clothing/head/caphat/formal/fedcover/eng
- icon_state = "fedcapeng"
- item_state = "fedcapeng"
+ icon_state = "fedcapeng"
+ item_state = "fedcapeng"
/obj/item/clothing/head/caphat/formal/fedcover/sec
- icon_state = "fedcapsec"
- item_state = "fedcapsec"
+ icon_state = "fedcapsec"
+ item_state = "fedcapsec"
/obj/item/clothing/head/caphat/formal/fedcover/black
- icon_state = "fedcapblack"
- item_state = "fedcapblack"
+ icon_state = "fedcapblack"
+ item_state = "fedcapblack"
//orvilike caps
/obj/item/clothing/head/kepi/orvi
diff --git a/modular_citadel/code/modules/custom_loadout/custom_items.dm b/modular_citadel/code/modules/custom_loadout/custom_items.dm
index 4ef5a91a92..3c208608c0 100644
--- a/modular_citadel/code/modules/custom_loadout/custom_items.dm
+++ b/modular_citadel/code/modules/custom_loadout/custom_items.dm
@@ -585,3 +585,12 @@
icon = 'icons/obj/custom.dmi'
mob_overlay_icon = 'icons/mob/clothing/custom_w.dmi'
mutantrace_variation = NONE
+
+/obj/item/clothing/neck/petcollar/choker
+ name = "NT Choker"
+ desc = "NT property since January 21st, 2562."
+ icon = 'icons/obj/custom.dmi'
+ icon_state = "choker"
+ mob_overlay_icon = 'icons/mob/clothing/custom_w.dmi'
+ item_state = "choker"
+ tagname = null
diff --git a/modular_citadel/code/modules/mob/cit_emotes.dm b/modular_citadel/code/modules/mob/cit_emotes.dm
index f7911def84..3eb656f65a 100644
--- a/modular_citadel/code/modules/mob/cit_emotes.dm
+++ b/modular_citadel/code/modules/mob/cit_emotes.dm
@@ -300,3 +300,24 @@
user.nextsoundemote = world.time + 7
var/sound = pick('sound/voice/slime_squish.ogg')
playsound(user, sound, 50, 1, -1)
+
+/datum/emote/living/pain
+ key = "pain"
+ key_third_person = "cries out in pain!"
+ message = "cries out in pain!"
+ emote_type = EMOTE_AUDIBLE
+ muzzle_ignore = FALSE
+ restraint_check = FALSE
+
+/datum/emote/living/pain/run_emote(mob/living/user, params)
+ if(!(. = ..()))
+ return
+ if(user.nextsoundemote >= world.time)
+ return
+ user.nextsoundemote = world.time + 7
+ var/sound
+ if(user.gender == MALE)
+ sound = pick('modular_citadel/sound/voice/human_male_pain_1.ogg', 'modular_citadel/sound/voice/human_male_pain_2.ogg', 'modular_citadel/sound/voice/human_male_pain_3.ogg', 'modular_citadel/sound/voice/human_male_pain_rare.ogg')
+ else
+ sound = pick('modular_citadel/sound/voice/human_female_pain_1.ogg', 'modular_citadel/sound/voice/human_female_pain_2.ogg', 'modular_citadel/sound/voice/human_female_pain_3.ogg')
+ playsound(user, sound, 50, 0, 0)
diff --git a/modular_citadel/code/modules/projectiles/guns/ballistic/rifles.dm b/modular_citadel/code/modules/projectiles/guns/ballistic/rifles.dm
index c2bf251de9..5a3f149dbb 100644
--- a/modular_citadel/code/modules/projectiles/guns/ballistic/rifles.dm
+++ b/modular_citadel/code/modules/projectiles/guns/ballistic/rifles.dm
@@ -9,7 +9,7 @@
item_state = "arg"
slot_flags = 0
mag_type = /obj/item/ammo_box/magazine/m556 //Uses the m90gl's magazine, just like the NT-ARG
- fire_sound = 'sound/weapons/gunshot_smg.ogg'
+ fire_sound = 'sound/weapons/rifleshot.ogg'
can_suppress = 0
burst_size = 6 //in line with XCOMEU stats. This can fire 5 bursts from a full magazine.
fire_delay = 1
@@ -85,23 +85,20 @@
///projectiles///
-/obj/item/projectile/bullet/cflechetteap //shreds armor
+/obj/item/projectile/bullet/cflechetteap //shreds armor but no wounds
name = "flechette (armor piercing)"
- damage = 8
- armour_penetration = 80
+ damage = 15
+ armour_penetration = 100
+ wound_bonus = -100
-/obj/item/projectile/bullet/cflechettes //shreds flesh and forces bleeding
+/obj/item/projectile/bullet/cflechettes //causes wounds fast but is heavily countered by armor
name = "flechette (serrated)"
damage = 15
dismemberment = 10
- armour_penetration = -80
-
-/obj/item/projectile/bullet/cflechettes/on_hit(atom/target, blocked = FALSE)
- if((blocked != 100) && iscarbon(target))
- var/mob/living/carbon/C = target
- C.bleed(10)
- return ..()
-
+ wound_bonus = 15
+ sharpness = SHARP_EDGED
+ wound_falloff_tile = 0
+
///ammo casings (CASELESS AMMO CASINGS WOOOOOOOO)///
/obj/item/ammo_casing/caseless/flechetteap
@@ -148,7 +145,7 @@
slot_flags = 0
pin = /obj/item/firing_pin/implant/pindicate
mag_type = /obj/item/ammo_box/magazine/flechette
- fire_sound = 'sound/weapons/gunshot_smg.ogg'
+ fire_sound = 'sound/weapons/rifleshot.ogg'
can_suppress = 0
burst_size = 5
fire_delay = 1
@@ -168,15 +165,19 @@
///unique variant///
-/obj/item/projectile/bullet/cflechetteshredder
+/obj/item/projectile/bullet/cflechetteshredder //you only get this with a 30TC bundle,5 magazines, as such this should be the superior ammotype
name = "flechette (shredder)"
- damage = 5
- dismemberment = 40
+ damage = 10
+ dismemberment = 50
+ wound_bonus = 50
+ armour_penetration = 100
+ sharpness = SHARP_EDGED
+ wound_falloff_tile = 0
/obj/item/ammo_casing/caseless/flechetteshredder
name = "flechette (shredder)"
desc = "A serrated flechette made of a special alloy that forms a monofilament edge."
- projectile_type = /obj/item/projectile/bullet/cflechettes
+ projectile_type = /obj/item/projectile/bullet/cflechetteshredder
/obj/item/ammo_box/magazine/flechette/shredder
name = "flechette magazine (shredder)"
@@ -185,7 +186,7 @@
/obj/item/gun/ballistic/automatic/flechette/shredder
name = "\improper CX Shredder"
- desc = "A flechette launching machine pistol made of ultra-light CFRP optimized for firing serrated monofillament flechettes."
+ desc = "A flechette launching machine pistol made of ultra-light CFRP optimized for firing serrated monofilament flechettes."
w_class = WEIGHT_CLASS_SMALL
spread = 15
recoil = 0.1
diff --git a/modular_citadel/code/modules/projectiles/guns/energy/energy_gun.dm b/modular_citadel/code/modules/projectiles/guns/energy/energy_gun.dm
index 65609f5830..9a8ee4bab1 100644
--- a/modular_citadel/code/modules/projectiles/guns/energy/energy_gun.dm
+++ b/modular_citadel/code/modules/projectiles/guns/energy/energy_gun.dm
@@ -2,7 +2,7 @@
The Recolourable Energy Gun
*//////////////////////////////////////////////////////////////////////////////////////////////
-obj/item/gun/energy/e_gun/cx
+/obj/item/gun/energy/e_gun/cx
name = "\improper CX Model D Energy Gun"
desc = "An overpriced hybrid energy gun with two settings: disable, and kill. Manufactured by CX Armories. Has a polychromic coating."
icon = 'modular_citadel/icons/obj/guns/cit_guns.dmi'
@@ -14,18 +14,18 @@ obj/item/gun/energy/e_gun/cx
flight_y_offset = 10
var/body_color = "#252528"
-obj/item/gun/energy/e_gun/cx/ComponentInitialize()
+/obj/item/gun/energy/e_gun/cx/ComponentInitialize()
. = ..()
AddElement(/datum/element/update_icon_updates_onmob)
-obj/item/gun/energy/e_gun/cx/update_overlays()
+/obj/item/gun/energy/e_gun/cx/update_overlays()
. = ..()
var/mutable_appearance/body_overlay = mutable_appearance('modular_citadel/icons/obj/guns/cit_guns.dmi', "cxegun_body")
if(body_color)
body_overlay.color = body_color
. += body_overlay
-obj/item/gun/energy/e_gun/cx/AltClick(mob/living/user)
+/obj/item/gun/energy/e_gun/cx/AltClick(mob/living/user)
. = ..()
if(!in_range(src, user)) //Basic checks to prevent abuse
return
@@ -39,7 +39,7 @@ obj/item/gun/energy/e_gun/cx/AltClick(mob/living/user)
body_color = sanitize_hexcolor(body_color_input, desired_format=6, include_crunch=1)
update_icon()
-obj/item/gun/energy/e_gun/cx/worn_overlays(isinhands, icon_file, used_state, style_flags = NONE)
+/obj/item/gun/energy/e_gun/cx/worn_overlays(isinhands, icon_file, used_state, style_flags = NONE)
. = ..()
if(isinhands)
var/mutable_appearance/body_inhand = mutable_appearance(icon_file, "cxe_body")
diff --git a/modular_citadel/code/modules/reagents/chemistry/reagents/enlargement.dm b/modular_citadel/code/modules/reagents/chemistry/reagents/enlargement.dm
index 2e5f3b8994..9870a2cd36 100644
--- a/modular_citadel/code/modules/reagents/chemistry/reagents/enlargement.dm
+++ b/modular_citadel/code/modules/reagents/chemistry/reagents/enlargement.dm
@@ -54,13 +54,8 @@
return..()
var/mob/living/carbon/human/H = M
- //If they've opted out, then route processing though liver.
+ //If they've opted out, ignore and return early.
if(!(H.client?.prefs.cit_toggles & BREAST_ENLARGEMENT))
- var/obj/item/organ/liver/L = H.getorganslot(ORGAN_SLOT_LIVER)
- if(L)
- L.applyOrganDamage(0.25)
- else
- H.adjustToxLoss(1)
return..()
var/obj/item/organ/genital/breasts/B = M.getorganslot(ORGAN_SLOT_BREASTS)
//otherwise proceed as normal
@@ -85,9 +80,6 @@
/datum/reagent/fermi/breast_enlarger/overdose_process(mob/living/carbon/M) //Turns you into a female if male and ODing, doesn't touch nonbinary and object genders.
if(!(M.client?.prefs.cit_toggles & FORCED_FEM))
- var/obj/item/organ/liver/L = M.getorganslot(ORGAN_SLOT_LIVER)
- if(L)
- L.applyOrganDamage(0.25)
return ..()
var/obj/item/organ/genital/penis/P = M.getorganslot(ORGAN_SLOT_PENIS)
@@ -122,9 +114,6 @@
/datum/reagent/fermi/BEsmaller/on_mob_life(mob/living/carbon/M)
var/obj/item/organ/genital/breasts/B = M.getorganslot(ORGAN_SLOT_BREASTS)
if(!(M.client?.prefs.cit_toggles & BREAST_ENLARGEMENT) || !B)
- var/obj/item/organ/liver/L = M.getorganslot(ORGAN_SLOT_LIVER)
- if(L)
- L.applyOrganDamage(-0.25)
return ..()
B.modify_size(-0.05)
return ..()
@@ -203,11 +192,6 @@
return ..()
var/mob/living/carbon/human/H = M
if(!(H.client?.prefs.cit_toggles & PENIS_ENLARGEMENT))
- var/obj/item/organ/liver/L = H.getorganslot(ORGAN_SLOT_LIVER)
- if(L)
- L.applyOrganDamage(0.25)
- else
- H.adjustToxLoss(1)
return ..()
var/obj/item/organ/genital/penis/P = H.getorganslot(ORGAN_SLOT_PENIS)
//otherwise proceed as normal
@@ -226,10 +210,8 @@
/datum/reagent/fermi/penis_enlarger/overdose_process(mob/living/carbon/human/M) //Turns you into a male if female and ODing, doesn't touch nonbinary and object genders.
if(!istype(M))
return ..()
+ // let's not kill them if they didn't consent.
if(!(M.client?.prefs.cit_toggles & FORCED_MASC))
- var/obj/item/organ/liver/L = M.getorganslot(ORGAN_SLOT_LIVER)
- if(L)
- L.applyOrganDamage(0.25)
return..()
var/obj/item/organ/genital/breasts/B = M.getorganslot(ORGAN_SLOT_BREASTS)
@@ -266,9 +248,6 @@
var/mob/living/carbon/human/H = M
var/obj/item/organ/genital/penis/P = H.getorganslot(ORGAN_SLOT_PENIS)
if(!(H.client?.prefs.cit_toggles & PENIS_ENLARGEMENT) || !P)
- var/obj/item/organ/liver/L = M.getorganslot(ORGAN_SLOT_LIVER)
- if(L)
- L.applyOrganDamage(-0.25)
return..()
P.modify_size(-0.1)
diff --git a/modular_citadel/code/modules/reagents/chemistry/reagents/fermi_reagents.dm b/modular_citadel/code/modules/reagents/chemistry/reagents/fermi_reagents.dm
index 1801986ebe..c6fae2ff8f 100644
--- a/modular_citadel/code/modules/reagents/chemistry/reagents/fermi_reagents.dm
+++ b/modular_citadel/code/modules/reagents/chemistry/reagents/fermi_reagents.dm
@@ -216,7 +216,6 @@
..()
/datum/reagent/fermi/nanite_b_gone/overdose_process(mob/living/carbon/C)
- //var/component/nanites/N = M.GetComponent(/datum/component/nanites)
var/datum/component/nanites/N = C.GetComponent(/datum/component/nanites)
if(prob(5))
to_chat(C, "The residual voltage from the nanites causes you to seize up!")
@@ -230,7 +229,7 @@
N.adjust_nanites(-10*cached_purity)
..()
-datum/reagent/fermi/nanite_b_gone/reaction_obj(obj/O, reac_volume)
+/datum/reagent/fermi/nanite_b_gone/reaction_obj(obj/O, reac_volume)
for(var/active_obj in react_objs)
if(O == active_obj)
return
@@ -335,39 +334,75 @@ datum/reagent/fermi/nanite_b_gone/reaction_obj(obj/O, reac_volume)
holder.clear_reagents()
/datum/reagent/fermi/acidic_buffer
- name = "Acidic buffer"
+ name = "Strong acidic buffer"
description = "This reagent will consume itself and move the pH of a beaker towards acidity when added to another."
color = "#fbc314"
pH = 0
+ chemical_flags = REAGENT_FORCEONNEW
can_synth = TRUE
+ var/strength = 1.5
//Consumes self on addition and shifts pH
/datum/reagent/fermi/acidic_buffer/on_new(datapH)
+ if(!holder)
+ return ..()
+ if(holder.reagents_holder_flags & NO_REACT)
+ return..()
if(holder.has_reagent(/datum/reagent/stabilizing_agent))
return ..()
data = datapH
if(LAZYLEN(holder.reagent_list) == 1)
return ..()
- holder.pH = ((holder.pH * holder.total_volume)+(pH * (volume)))/(holder.total_volume + (volume))
+ if(holder.pH < pH)
+ holder.my_atom.visible_message("The beaker fizzes as the buffer is added, to no effect.")
+ playsound(holder.my_atom, 'sound/FermiChem/bufferadd.ogg', 50, 1)
+ return ..()
+ holder.pH = clamp((((holder.pH * (holder.total_volume-(volume*strength)))+(pH * (volume*strength)) )/holder.total_volume), 0, 14) //This is BEFORE removal
holder.my_atom.visible_message("The beaker fizzes as the pH changes!")
playsound(holder.my_atom, 'sound/FermiChem/bufferadd.ogg', 50, 1)
holder.remove_reagent(type, volume, ignore_pH = TRUE)
..()
+/datum/reagent/fermi/acidic_buffer/weak
+ name = "Acidic buffer"
+ description = "This reagent will consume itself and move the pH of a beaker towards acidity when added to another."
+ color = "#fbf344"
+ pH = 4
+ can_synth = TRUE
+ strength = 0.25
+
/datum/reagent/fermi/basic_buffer
- name = "Basic buffer"
+ name = "Strong basic buffer"
description = "This reagent will consume itself and move the pH of a beaker towards alkalinity when added to another."
color = "#3853a4"
pH = 14
+ chemical_flags = REAGENT_FORCEONNEW
can_synth = TRUE
+ var/strength = 1.5
+
+/datum/reagent/fermi/basic_buffer/weak
+ name = "Basic buffer"
+ description = "This reagent will consume itself and move the pH of a beaker towards alkalinity when added to another."
+ color = "#5873c4"
+ pH = 10
+ can_synth = TRUE
+ strength = 0.25
/datum/reagent/fermi/basic_buffer/on_new(datapH)
+ if(!holder)
+ return ..()
+ if(holder.reagents_holder_flags & NO_REACT)
+ return..()
if(holder.has_reagent(/datum/reagent/stabilizing_agent))
return ..()
data = datapH
if(LAZYLEN(holder.reagent_list) == 1)
return ..()
- holder.pH = ((holder.pH * holder.total_volume)+(pH * (volume)))/(holder.total_volume + (volume))
+ if(holder.pH > pH)
+ holder.my_atom.visible_message("The beaker froths as the buffer is added, to no effect.")
+ playsound(holder.my_atom, 'sound/FermiChem/bufferadd.ogg', 50, 1)
+ return ..()
+ holder.pH = clamp((((holder.pH * (holder.total_volume-(volume*strength)))+(pH * (volume*strength)) )/holder.total_volume), 0, 14) //This is BEFORE removal
holder.my_atom.visible_message("The beaker froths as the pH changes!")
playsound(holder.my_atom, 'sound/FermiChem/bufferadd.ogg', 50, 1)
holder.remove_reagent(type, volume, ignore_pH = TRUE)
diff --git a/modular_citadel/code/modules/reagents/chemistry/recipes/fermi.dm b/modular_citadel/code/modules/reagents/chemistry/recipes/fermi.dm
index 21f525088c..c144fa9196 100644
--- a/modular_citadel/code/modules/reagents/chemistry/recipes/fermi.dm
+++ b/modular_citadel/code/modules/reagents/chemistry/recipes/fermi.dm
@@ -93,9 +93,8 @@
e.set_up(round((volume/28)*(pH-9)), T, 0, 0)
e.start()
- if(!ImpureTot == 0) //If impure, v.small emp (0.6 or less)
- ImpureTot *= volume
- empulse(T, volume, 1)
+ if(ImpureTot) //If impure, v.small emp (0.6 or less)
+ empulse(T, ImpureTot, 1)
my_atom.reagents.clear_reagents() //just in case
return
diff --git a/modular_citadel/icons/ui/screen_clockwork.dmi b/modular_citadel/icons/ui/screen_clockwork.dmi
index 3a7ba8338f..82fd91026b 100644
Binary files a/modular_citadel/icons/ui/screen_clockwork.dmi and b/modular_citadel/icons/ui/screen_clockwork.dmi differ
diff --git a/modular_citadel/icons/ui/screen_midnight.dmi b/modular_citadel/icons/ui/screen_midnight.dmi
index fc446a411c..8990650347 100644
Binary files a/modular_citadel/icons/ui/screen_midnight.dmi and b/modular_citadel/icons/ui/screen_midnight.dmi differ
diff --git a/modular_citadel/icons/ui/screen_operative.dmi b/modular_citadel/icons/ui/screen_operative.dmi
index 9383b94718..9a784fb14a 100644
Binary files a/modular_citadel/icons/ui/screen_operative.dmi and b/modular_citadel/icons/ui/screen_operative.dmi differ
diff --git a/modular_citadel/icons/ui/screen_plasmafire.dmi b/modular_citadel/icons/ui/screen_plasmafire.dmi
index 97e577c7bd..9a546cad6e 100644
Binary files a/modular_citadel/icons/ui/screen_plasmafire.dmi and b/modular_citadel/icons/ui/screen_plasmafire.dmi differ
diff --git a/modular_citadel/icons/ui/screen_slimecore.dmi b/modular_citadel/icons/ui/screen_slimecore.dmi
index 8f45ff3f76..22f97207df 100644
Binary files a/modular_citadel/icons/ui/screen_slimecore.dmi and b/modular_citadel/icons/ui/screen_slimecore.dmi differ
diff --git a/modular_citadel/sound/voice/human_female_pain_1.ogg b/modular_citadel/sound/voice/human_female_pain_1.ogg
new file mode 100644
index 0000000000..f697996e56
Binary files /dev/null and b/modular_citadel/sound/voice/human_female_pain_1.ogg differ
diff --git a/modular_citadel/sound/voice/human_female_pain_2.ogg b/modular_citadel/sound/voice/human_female_pain_2.ogg
new file mode 100644
index 0000000000..aa2eaba352
Binary files /dev/null and b/modular_citadel/sound/voice/human_female_pain_2.ogg differ
diff --git a/modular_citadel/sound/voice/human_female_pain_3.ogg b/modular_citadel/sound/voice/human_female_pain_3.ogg
new file mode 100644
index 0000000000..c21d462ba5
Binary files /dev/null and b/modular_citadel/sound/voice/human_female_pain_3.ogg differ
diff --git a/modular_citadel/sound/voice/human_male_pain_1.ogg b/modular_citadel/sound/voice/human_male_pain_1.ogg
new file mode 100644
index 0000000000..0dbedfe7e8
Binary files /dev/null and b/modular_citadel/sound/voice/human_male_pain_1.ogg differ
diff --git a/modular_citadel/sound/voice/human_male_pain_2.ogg b/modular_citadel/sound/voice/human_male_pain_2.ogg
new file mode 100644
index 0000000000..6f4a314c5c
Binary files /dev/null and b/modular_citadel/sound/voice/human_male_pain_2.ogg differ
diff --git a/modular_citadel/sound/voice/human_male_pain_3.ogg b/modular_citadel/sound/voice/human_male_pain_3.ogg
new file mode 100644
index 0000000000..7b13505345
Binary files /dev/null and b/modular_citadel/sound/voice/human_male_pain_3.ogg differ
diff --git a/modular_citadel/sound/voice/human_male_pain_rare.ogg b/modular_citadel/sound/voice/human_male_pain_rare.ogg
new file mode 100644
index 0000000000..73a5da2faf
Binary files /dev/null and b/modular_citadel/sound/voice/human_male_pain_rare.ogg differ
diff --git a/modular_citadel/sound/voice/pain emote credits.txt b/modular_citadel/sound/voice/pain emote credits.txt
new file mode 100644
index 0000000000..10b0c205df
--- /dev/null
+++ b/modular_citadel/sound/voice/pain emote credits.txt
@@ -0,0 +1 @@
+pain emote sound ported from https://gitlab.com/cmdevs/colonial-warfare
\ No newline at end of file
diff --git a/sound/effects/whistlereset.ogg b/sound/effects/whistlereset.ogg
new file mode 100644
index 0000000000..cf55c06ca8
Binary files /dev/null and b/sound/effects/whistlereset.ogg differ
diff --git a/sound/weapons/LaserSlugv3.ogg b/sound/weapons/LaserSlugv3.ogg
index 0c3de3d4fd..759774c5c9 100644
Binary files a/sound/weapons/LaserSlugv3.ogg and b/sound/weapons/LaserSlugv3.ogg differ
diff --git a/sound/weapons/ParticleBlaster.ogg b/sound/weapons/ParticleBlaster.ogg
index ae0ae165f9..c52282aaab 100644
Binary files a/sound/weapons/ParticleBlaster.ogg and b/sound/weapons/ParticleBlaster.ogg differ
diff --git a/sound/weapons/beam_sniper.ogg b/sound/weapons/beam_sniper.ogg
index 0bd7b89c8d..257df1c545 100644
Binary files a/sound/weapons/beam_sniper.ogg and b/sound/weapons/beam_sniper.ogg differ
diff --git a/sound/weapons/grenadelaunch.ogg b/sound/weapons/grenadelaunch.ogg
index 4662058f28..6a9020f737 100644
Binary files a/sound/weapons/grenadelaunch.ogg and b/sound/weapons/grenadelaunch.ogg differ
diff --git a/sound/weapons/gunshot_smg_alt.ogg b/sound/weapons/gunshot_smg_alt.ogg
new file mode 100644
index 0000000000..373c1ea4ba
Binary files /dev/null and b/sound/weapons/gunshot_smg_alt.ogg differ
diff --git a/sound/weapons/gunshotshotgunshot.ogg b/sound/weapons/gunshotshotgunshot.ogg
new file mode 100644
index 0000000000..7c513184ec
Binary files /dev/null and b/sound/weapons/gunshotshotgunshot.ogg differ
diff --git a/sound/weapons/lmgshot.ogg b/sound/weapons/lmgshot.ogg
new file mode 100644
index 0000000000..a895e59aa2
Binary files /dev/null and b/sound/weapons/lmgshot.ogg differ
diff --git a/sound/weapons/magpistol.ogg b/sound/weapons/magpistol.ogg
index 4b94aa1e0a..96eb22c77d 100644
Binary files a/sound/weapons/magpistol.ogg and b/sound/weapons/magpistol.ogg differ
diff --git a/sound/weapons/magrifle.ogg b/sound/weapons/magrifle.ogg
index 67d6500a6c..1c10ea6b0e 100644
Binary files a/sound/weapons/magrifle.ogg and b/sound/weapons/magrifle.ogg differ
diff --git a/sound/weapons/noscope.ogg b/sound/weapons/noscope.ogg
new file mode 100644
index 0000000000..84c607fe03
Binary files /dev/null and b/sound/weapons/noscope.ogg differ
diff --git a/sound/weapons/plasma_cutter.ogg b/sound/weapons/plasma_cutter.ogg
index ba95317cc1..d555110afa 100644
Binary files a/sound/weapons/plasma_cutter.ogg and b/sound/weapons/plasma_cutter.ogg differ
diff --git a/sound/weapons/revolvershot.ogg b/sound/weapons/revolvershot.ogg
new file mode 100644
index 0000000000..ac6caaf247
Binary files /dev/null and b/sound/weapons/revolvershot.ogg differ
diff --git a/sound/weapons/rifleshot.ogg b/sound/weapons/rifleshot.ogg
new file mode 100644
index 0000000000..3bc70a7914
Binary files /dev/null and b/sound/weapons/rifleshot.ogg differ
diff --git a/sound/weapons/rocketlaunch.ogg b/sound/weapons/rocketlaunch.ogg
index 6972eda044..42a99c7518 100644
Binary files a/sound/weapons/rocketlaunch.ogg and b/sound/weapons/rocketlaunch.ogg differ
diff --git a/sound/weapons/woodbonk.ogg b/sound/weapons/woodbonk.ogg
new file mode 100644
index 0000000000..5fbadb104d
Binary files /dev/null and b/sound/weapons/woodbonk.ogg differ
diff --git a/tgstation.dme b/tgstation.dme
index c069e0fdca..000bb0cf52 100644
--- a/tgstation.dme
+++ b/tgstation.dme
@@ -292,6 +292,7 @@
#include "code\controllers\configuration\entries\fail2topic.dm"
#include "code\controllers\configuration\entries\game_options.dm"
#include "code\controllers\configuration\entries\general.dm"
+#include "code\controllers\configuration\entries\logging.dm"
#include "code\controllers\configuration\entries\persistence.dm"
#include "code\controllers\configuration\entries\plushies.dm"
#include "code\controllers\configuration\entries\policy.dm"
@@ -503,6 +504,7 @@
#include "code\datums\components\twohanded.dm"
#include "code\datums\components\uplink.dm"
#include "code\datums\components\virtual_reality.dm"
+#include "code\datums\components\waddling.dm"
#include "code\datums\components\wearertargeting.dm"
#include "code\datums\components\wet_floor.dm"
#include "code\datums\components\crafting\crafting.dm"
@@ -535,6 +537,7 @@
#include "code\datums\components\storage\concrete\rped.dm"
#include "code\datums\components\storage\concrete\special.dm"
#include "code\datums\components\storage\concrete\stack.dm"
+#include "code\datums\components\storage\concrete\tcg.dm"
#include "code\datums\diseases\_disease.dm"
#include "code\datums\diseases\_MobProcs.dm"
#include "code\datums\diseases\anxiety.dm"
@@ -619,6 +622,7 @@
#include "code\datums\elements\tactical.dm"
#include "code\datums\elements\update_icon_blocker.dm"
#include "code\datums\elements\update_icon_updates_onmob.dm"
+#include "code\datums\elements\ventcrawling.dm"
#include "code\datums\elements\wuv.dm"
#include "code\datums\helper_datums\events.dm"
#include "code\datums\helper_datums\getrev.dm"
@@ -2333,6 +2337,7 @@
#include "code\modules\language\mushroom.dm"
#include "code\modules\language\narsian.dm"
#include "code\modules\language\ratvarian.dm"
+#include "code\modules\language\signlanguage.dm"
#include "code\modules\language\slime.dm"
#include "code\modules\language\swarmer.dm"
#include "code\modules\language\sylvan.dm"
@@ -3487,6 +3492,10 @@
#include "code\modules\surgery\organs\tails.dm"
#include "code\modules\surgery\organs\tongue.dm"
#include "code\modules\surgery\organs\vocal_cords.dm"
+#include "code\modules\tcg\cards.dm"
+#include "code\modules\tcg\pack_1.dm"
+#include "code\modules\tcg\pack_nuclear.dm"
+#include "code\modules\tcg\pack_star.dm"
#include "code\modules\tgchat\message.dm"
#include "code\modules\tgchat\to_chat.dm"
#include "code\modules\tgs\includes.dm"
diff --git a/tgui/packages/tgui-panel/chat/renderer.js b/tgui/packages/tgui-panel/chat/renderer.js
index 10b1c6e024..f16ed9046a 100644
--- a/tgui/packages/tgui-panel/chat/renderer.js
+++ b/tgui/packages/tgui-panel/chat/renderer.js
@@ -176,7 +176,7 @@ class ChatRenderer {
this.highlightColor = null;
return;
}
- const allowedRegex = /^[a-z0-9_\-\s]+$/ig;
+ const allowedRegex = /^[a-z0-9_\-\s]+$/i; // citadel update - ig changed to i for flags, to fix issues with highlighting only working for every other word.
const lines = String(text)
.split(',')
.map(str => str.trim())
diff --git a/tgui/packages/tgui/interfaces/ChemDispenser.js b/tgui/packages/tgui/interfaces/ChemDispenser.js
index 0724a9e85f..23498caf34 100644
--- a/tgui/packages/tgui/interfaces/ChemDispenser.js
+++ b/tgui/packages/tgui/interfaces/ChemDispenser.js
@@ -1,13 +1,20 @@
import { toFixed } from 'common/math';
import { toTitleCase } from 'common/string';
import { Fragment } from 'inferno';
-import { useBackend } from '../backend';
-import { AnimatedNumber, Box, Button, Icon, LabeledList, ProgressBar, Section } from '../components';
+import { useBackend, useLocalState } from '../backend';
+import { AnimatedNumber, Box, Button, Icon, LabeledList, ProgressBar, Section, Table, NumberInput } from '../components';
import { Window } from '../layouts';
export const ChemDispenser = (props, context) => {
const { act, data } = useBackend(context);
const recording = !!data.recordingRecipe;
+ const [hasCol, setHasCol] = useLocalState(
+ context, 'fs_title', false);
+ const [modeToggle, setModeToggle] = useLocalState(
+ context, 'mode_toggle', true);
+ const {
+ storedContents = [],
+ } = data;
// TODO: Change how this piece of shit is built on server side
// It has to be a list, not a fucking OBJECT!
const recipes = Object.keys(data.recipes)
@@ -28,17 +35,27 @@ export const ChemDispenser = (props, context) => {
return (
-
- Recording
-
- )}>
+ buttons={
+ [(recording && (
+
+
+ Recording
+
+ )),
+ (
-
+ {!!data.canStore && (
+
+ Transfer amount:
+
+ u
+
+ }>
+
+ {toFixed(data.storedVol) + ' units / ' + data.maxVol + ' units'}
+
+
+ {storedContents.map(chemical => (
+
+ ))}
+
+
+ )}
{
{recording
&& 'Virtual beaker'
|| data.isBeakerLoaded
- && (
-
-
- /{data.beakerMaxVolume} units
-
- )
+ && (
+
+
+ /{data.beakerMaxVolume} units
+
+ )
|| 'No beaker'}
{
{(!data.isBeakerLoaded && !recording) && 'N/A'
|| beakerContents.length === 0 && 'Nothing'}
- {beakerContents.map(chemical => (
-
-
- {' '}
- units of {chemical.name}
-
- ))}
+
+ {beakerContents.map(chemical => (
+
+ ))}
+
pH:
@@ -196,3 +260,60 @@ export const ChemDispenser = (props, context) => {
);
};
+
+
+const ChemicalBuffer = Table;
+
+const ChemicalBufferEntry = (props, context) => {
+ const { act, data } = useBackend(context);
+ const { chemical, transferTo } = props;
+ return (
+
+
+
+ {` units of ${chemical.name}`}
+
+
+
+
+ );
+};
+
+const ChemicalBeaker = Table;
+
+const ChemicalBeakerEntry = (props, context) => {
+ const { act, data } = useBackend(context);
+ const { chemical, transferTo } = props;
+ return (
+
+
+
+ {` units of ${chemical.name}`}
+
+ {!!data.canStore && (
+
+
+ )}
+
+ );
+};
\ No newline at end of file
diff --git a/tgui/packages/tgui/interfaces/ChemMaster.js b/tgui/packages/tgui/interfaces/ChemMaster.js
index ddca187244..1cf66ae0e4 100644
--- a/tgui/packages/tgui/interfaces/ChemMaster.js
+++ b/tgui/packages/tgui/interfaces/ChemMaster.js
@@ -400,11 +400,11 @@ const AnalysisResults = (props, context) => {
{analyzeVars.addicD}
- {!!fermianalyze && ( // why did you do that before? it's fucking bad.
+
+ {analyzeVars.purityF}
+
+ {!! data.fermianalyze && ( // why did you do that before? it's bad.
-
- {analyzeVars.purityF}
-
{analyzeVars.inverseRatioF}
diff --git a/tgui/packages/tgui/interfaces/Orbit.js b/tgui/packages/tgui/interfaces/Orbit.js
index 7423dadbc4..1b6daccabc 100644
--- a/tgui/packages/tgui/interfaces/Orbit.js
+++ b/tgui/packages/tgui/interfaces/Orbit.js
@@ -1,10 +1,10 @@
import { createSearch } from 'common/string';
+import { multiline } from 'common/string';
import { resolveAsset } from '../assets';
import { useBackend, useLocalState } from '../backend';
-import { Box, Button, Flex, Icon, Input, Section } from '../components';
+import { Box, Button, Divider, Flex, Icon, Input, Section } from '../components';
import { Window } from '../layouts';
-const PATTERN_DESCRIPTOR = / \[(?:ghost|dead)\]$/;
const PATTERN_NUMBER = / \(([0-9]+)\)$/;
const searchFor = searchText => createSearch(searchText, thing => thing.name);
@@ -43,7 +43,7 @@ const BasicSection = (props, context) => {
{things.map(thing => (