| "
@@ -1561,15 +1571,17 @@ GLOBAL_LIST_EMPTY(preferences_datums)
ShowChoices(user)
return 1
-/datum/preferences/proc/copy_to(mob/living/carbon/human/character, icon_updates = 1, roundstart_checks = TRUE, character_setup = FALSE)
+/datum/preferences/proc/copy_to(mob/living/carbon/human/character, icon_updates = 1, roundstart_checks = TRUE, character_setup = FALSE, antagonist = FALSE)
if(randomise[RANDOM_SPECIES] && !character_setup)
random_species()
- if(randomise[RANDOM_BODY] && !character_setup)
- random_character(gender)
+ if((randomise[RANDOM_BODY] || randomise[RANDOM_BODY_ANTAG] && antagonist) && !character_setup)
+ slot_randomized = TRUE
+ random_character(gender, antagonist)
- if(randomise[RANDOM_NAME] && !character_setup)
+ if((randomise[RANDOM_NAME] || randomise[RANDOM_NAME_ANTAG] && antagonist) && !character_setup)
+ slot_randomized = TRUE
real_name = pref_species.random_name(gender)
if(roundstart_checks)
diff --git a/code/modules/clothing/outfits/standard.dm b/code/modules/clothing/outfits/standard.dm
index 1c4b6262745..6d55b96c070 100644
--- a/code/modules/clothing/outfits/standard.dm
+++ b/code/modules/clothing/outfits/standard.dm
@@ -422,7 +422,7 @@
/datum/outfit/debug //Debug objs plus hardsuit
name = "Debug outfit"
uniform = /obj/item/clothing/under/misc/patriotsuit
- suit = /obj/item/clothing/suit/space/hardsuit/syndi/elite
+ suit = /obj/item/clothing/suit/space/hardsuit/syndi/elite/debug
glasses = /obj/item/clothing/glasses/meson/night
ears = /obj/item/radio/headset/headset_cent/commander
mask = /obj/item/clothing/mask/gas/welding/up
@@ -439,5 +439,6 @@
/obj/item/melee/transforming/energy/axe=1,\
/obj/item/storage/part_replacer/bluespace/tier4=1,\
/obj/item/gun/magic/wand/resurrection/debug=1,\
+ /obj/item/gun/magic/wand/death/debug=1,\
/obj/item/debug/human_spawner=1
)
diff --git a/code/modules/clothing/spacesuits/hardsuit.dm b/code/modules/clothing/spacesuits/hardsuit.dm
index 4f9eeaf2059..55da8c28b1c 100644
--- a/code/modules/clothing/spacesuits/hardsuit.dm
+++ b/code/modules/clothing/spacesuits/hardsuit.dm
@@ -364,6 +364,12 @@
max_heat_protection_temperature = FIRE_IMMUNITY_MAX_TEMP_PROTECT
resistance_flags = FIRE_PROOF | ACID_PROOF
+/obj/item/clothing/head/helmet/space/hardsuit/syndi/elite/debug
+
+/obj/item/clothing/head/helmet/space/hardsuit/syndi/elite/debug/Initialize()
+ . = ..()
+ soundloop.volume = 0
+
/obj/item/clothing/suit/space/hardsuit/syndi/elite
name = "elite syndicate hardsuit"
desc = "An elite version of the syndicate hardsuit, with improved armour and fireproofing. It is in travel mode."
@@ -376,6 +382,9 @@
max_heat_protection_temperature = FIRE_IMMUNITY_MAX_TEMP_PROTECT
resistance_flags = FIRE_PROOF | ACID_PROOF
+/obj/item/clothing/suit/space/hardsuit/syndi/elite/debug
+ helmettype = /obj/item/clothing/head/helmet/space/hardsuit/syndi/elite/debug
+
//The Owl Hardsuit
/obj/item/clothing/head/helmet/space/hardsuit/syndi/owl
name = "owl hardsuit helmet"
diff --git a/code/modules/food_and_drinks/food/condiment.dm b/code/modules/food_and_drinks/food/condiment.dm
index feacd4713e4..59dd003d356 100644
--- a/code/modules/food_and_drinks/food/condiment.dm
+++ b/code/modules/food_and_drinks/food/condiment.dm
@@ -30,7 +30,7 @@
/datum/reagent/consumable/capsaicin = list("icon_state" = "hotsauce", "item_state" = "", "icon_empty" = "", "name" = "hotsauce bottle", "desc" = "You can almost TASTE the stomach ulcers!"),
/datum/reagent/consumable/frostoil = list("icon_state" = "coldsauce", "item_state" = "", "icon_empty" = "", "name" = "coldsauce bottle", "desc" = "Leaves the tongue numb from its passage."),
/datum/reagent/consumable/cornoil = list("icon_state" = "oliveoil", "item_state" = "", "icon_empty" = "", "name" = "corn oil bottle", "desc" = "A delicious oil used in cooking. Made from corn."),
-
+ /datum/reagent/consumable/bbqsauce = list("icon_state" = "bbqsauce", "item_state" = "", "icon_empty" = "", "name" = "bbq sauce bottle", "desc" = "Hand wipes not included."),
)
var/originalname = "condiment" //Can't use initial(name) for this. This stores the name set by condimasters.
var/icon_empty = ""
@@ -248,6 +248,7 @@
/datum/reagent/consumable/cornoil = list("condi_cornoil", "Corn Oil", "A delicious oil used in cooking. Made from corn"),
/datum/reagent/consumable/sugar = list("condi_sugar", "Sugar", "Tasty spacey sugar!"),
/datum/reagent/consumable/astrotame = list("condi_astrotame", "Astrotame", "The sweetness of a thousand sugars but none of the calories."),
+ /datum/reagent/consumable/bbqsauce = list("condi_bbq", "BBQ sauce", "Hand wipes not included."),
)
/obj/item/reagent_containers/food/condiment/pack/update_icon()
@@ -306,3 +307,8 @@
name = "astrotame pack"
originalname = "astrotame"
list_reagents = list(/datum/reagent/consumable/astrotame = 5)
+
+/obj/item/reagent_containers/food/condiment/pack/bbqsauce
+ name = "bbq sauce pack"
+ originalname = "bbq sauce"
+ list_reagents = list(/datum/reagent/consumable/bbqsauce = 10)
\ No newline at end of file
diff --git a/code/modules/food_and_drinks/food/snacks_meat.dm b/code/modules/food_and_drinks/food/snacks_meat.dm
index 814768a2098..2169deed036 100644
--- a/code/modules/food_and_drinks/food/snacks_meat.dm
+++ b/code/modules/food_and_drinks/food/snacks_meat.dm
@@ -312,3 +312,13 @@
icon_state = "doubleratkebab"
tastes = list("rat meat" = 2, "metal" = 1)
bonus_reagents = list(/datum/reagent/consumable/nutriment = 6, /datum/reagent/consumable/nutriment/vitamin = 2)
+
+/obj/item/reagent_containers/food/snacks/bbqribs
+ name = "bbq ribs"
+ desc = "BBQ ribs, slathered in a healthy coating of BBQ sauce. The least vegan thing to ever exist."
+ icon_state = "ribs"
+ w_class = WEIGHT_CLASS_NORMAL
+ list_reagents = list(/datum/reagent/consumable/nutriment = 8, /datum/reagent/consumable/nutriment/vitamin = 2, /datum/reagent/consumable/bbqsauce = 5)
+ bonus_reagents = list(/datum/reagent/consumable/nutriment = 1, /datum/reagent/consumable/nutriment/vitamin = 1)
+ tastes = list("meat" = 3, "smokey sauce" = 1)
+ foodtype = MEAT
\ No newline at end of file
diff --git a/code/modules/food_and_drinks/recipes/food_mixtures.dm b/code/modules/food_and_drinks/recipes/food_mixtures.dm
index 5e510fd3e0c..1ab9ccfae97 100644
--- a/code/modules/food_and_drinks/recipes/food_mixtures.dm
+++ b/code/modules/food_and_drinks/recipes/food_mixtures.dm
@@ -184,3 +184,9 @@
results = list(/datum/reagent/consumable/nutriment/peptides = 0.5)
required_reagents = list(/datum/reagent/consumable/nutriment/ = 0.5)
required_catalysts = list(/datum/reagent/medicine/metafactor = 0.5)
+
+/datum/chemical_reaction/bbqsauce
+ name = "BBQ Sauce"
+ id = /datum/reagent/consumable/bbqsauce
+ results = list(/datum/reagent/consumable/bbqsauce = 5)
+ required_reagents = list(/datum/reagent/ash = 1, /datum/reagent/consumable/tomatojuice = 1, /datum/reagent/medicine/salglu_solution = 3, /datum/reagent/consumable/blackpepper = 1)
\ No newline at end of file
diff --git a/code/modules/food_and_drinks/recipes/tablecraft/recipes_meat.dm b/code/modules/food_and_drinks/recipes/tablecraft/recipes_meat.dm
index 3a458fae75e..8f748201fa8 100644
--- a/code/modules/food_and_drinks/recipes/tablecraft/recipes_meat.dm
+++ b/code/modules/food_and_drinks/recipes/tablecraft/recipes_meat.dm
@@ -198,3 +198,13 @@
)
result = /obj/item/reagent_containers/food/snacks/salad/ricepork
subcategory = CAT_MEAT
+
+/datum/crafting_recipe/food/ribs
+ name = "BBQ Ribs"
+ reqs = list(
+ /datum/reagent/consumable/bbqsauce = 5,
+ /obj/item/reagent_containers/food/snacks/meat/steak/plain = 2,
+ /obj/item/stack/rods = 2
+ )
+ result = /obj/item/reagent_containers/food/snacks/bbqribs
+ subcategory = CAT_MEAT
\ No newline at end of file
diff --git a/code/modules/mining/equipment/goliath_hide.dm b/code/modules/mining/equipment/goliath_hide.dm
deleted file mode 100644
index 48f0ca0be51..00000000000
--- a/code/modules/mining/equipment/goliath_hide.dm
+++ /dev/null
@@ -1,12 +0,0 @@
-/**********************Goliath Hide**********************/
-/obj/item/stack/sheet/animalhide/goliath_hide
- name = "goliath hide plates"
- desc = "Pieces of a goliath's rocky hide, these might be able to make your suit a bit more durable to attack from the local fauna."
- icon = 'icons/obj/mining.dmi'
- icon_state = "goliath_hide"
- singular_name = "hide plate"
- max_amount = 6
- novariants = FALSE
- item_flags = NOBLUDGEON
- w_class = WEIGHT_CLASS_NORMAL
- layer = MOB_LAYER
diff --git a/code/modules/mob/dead/new_player/new_player.dm b/code/modules/mob/dead/new_player/new_player.dm
index cc5c7d1adf1..764aac497d6 100644
--- a/code/modules/mob/dead/new_player/new_player.dm
+++ b/code/modules/mob/dead/new_player/new_player.dm
@@ -122,7 +122,7 @@
new_player_panel()
if(href_list["late_join"])
- if(!SSticker || !SSticker.IsRoundInProgress())
+ if(!SSticker?.IsRoundInProgress())
to_chat(usr, "The round is either not ready, or has already finished...")
return
@@ -148,6 +148,9 @@
ViewManifest()
if(href_list["SelectedJob"])
+ if(!SSticker?.IsRoundInProgress())
+ to_chat(usr, "The round is either not ready, or has already finished...")
+ return
if(!GLOB.enter_allowed)
to_chat(usr, "There is an administrative lock on entering the game!")
@@ -478,7 +481,12 @@
if(frn)
client.prefs.random_character()
client.prefs.real_name = client.prefs.pref_species.random_name(gender,1)
- client.prefs.copy_to(H)
+
+ var/is_antag
+ if(mind in GLOB.pre_setup_antags)
+ is_antag = TRUE
+
+ client.prefs.copy_to(H, antagonist = is_antag)
H.dna.update_dna_identity()
if(mind)
if(transfer_after)
diff --git a/code/modules/mob/dead/new_player/preferences_setup.dm b/code/modules/mob/dead/new_player/preferences_setup.dm
index 547918295d8..7dd7a596c25 100644
--- a/code/modules/mob/dead/new_player/preferences_setup.dm
+++ b/code/modules/mob/dead/new_player/preferences_setup.dm
@@ -1,15 +1,15 @@
//The mob should have a gender you want before running this proc. Will run fine without H
-/datum/preferences/proc/random_character(gender_override)
+/datum/preferences/proc/random_character(gender_override, antag_override = FALSE)
if(randomise[RANDOM_SPECIES])
random_species()
else if(randomise[RANDOM_NAME])
real_name = pref_species.random_name(gender,1)
- if(gender_override && !(randomise[RANDOM_GENDER]))
+ if(gender_override && !(randomise[RANDOM_GENDER] || randomise[RANDOM_GENDER_ANTAG] && antag_override))
gender = gender_override
else
- gender = pick(MALE,FEMALE)
- if(randomise[RANDOM_AGE])
+ gender = pick(MALE,FEMALE,PLURAL)
+ if(randomise[RANDOM_AGE] || randomise[RANDOM_AGE_ANTAG] && antag_override)
age = rand(AGE_MIN,AGE_MAX)
if(randomise[RANDOM_UNDERWEAR])
underwear = random_underwear(gender)
@@ -74,4 +74,4 @@
COMPILE_OVERLAYS(mannequin)
parent.show_character_previews(new /mutable_appearance(mannequin))
- unset_busy_human_dummy(DUMMY_HUMAN_SLOT_PREFERENCES)
\ No newline at end of file
+ unset_busy_human_dummy(DUMMY_HUMAN_SLOT_PREFERENCES)
diff --git a/code/modules/mob/living/carbon/carbon.dm b/code/modules/mob/living/carbon/carbon.dm
index 57002fc7f90..6abb63ed852 100644
--- a/code/modules/mob/living/carbon/carbon.dm
+++ b/code/modules/mob/living/carbon/carbon.dm
@@ -140,6 +140,7 @@
stop_pulling()
if(HAS_TRAIT(src, TRAIT_PACIFISM))
to_chat(src, "You gently let go of [throwable_mob].")
+ return
var/turf/start_T = get_turf(loc) //Get the start and target tile for the descriptors
var/turf/end_T = get_turf(target)
if(start_T && end_T)
diff --git a/code/modules/mob/living/carbon/human/human_defense.dm b/code/modules/mob/living/carbon/human/human_defense.dm
index c6aa35da193..733161dd2bf 100644
--- a/code/modules/mob/living/carbon/human/human_defense.dm
+++ b/code/modules/mob/living/carbon/human/human_defense.dm
@@ -344,6 +344,9 @@
/mob/living/carbon/human/mech_melee_attack(obj/mecha/M)
if(M.occupant.a_intent == INTENT_HARM)
+ if(HAS_TRAIT(M.occupant, TRAIT_PACIFISM))
+ to_chat(M.occupant, "You don't want to harm other living beings!")
+ return
M.do_attack_animation(src)
if(M.damtype == "brute")
step_away(src,M,15)
diff --git a/code/modules/mob/living/living_defense.dm b/code/modules/mob/living/living_defense.dm
index 3d3c8f86269..8d75521f80f 100644
--- a/code/modules/mob/living/living_defense.dm
+++ b/code/modules/mob/living/living_defense.dm
@@ -88,6 +88,9 @@
/mob/living/mech_melee_attack(obj/mecha/M)
if(M.occupant.a_intent == INTENT_HARM)
+ if(HAS_TRAIT(M.occupant, TRAIT_PACIFISM))
+ to_chat(M.occupant, "You don't want to harm other living beings!")
+ return
M.do_attack_animation(src)
if(M.damtype == "brute")
step_away(src,M,15)
diff --git a/code/modules/mob/living/silicon/silicon.dm b/code/modules/mob/living/silicon/silicon.dm
index af71f611f3b..4b05de7dacc 100644
--- a/code/modules/mob/living/silicon/silicon.dm
+++ b/code/modules/mob/living/silicon/silicon.dm
@@ -45,7 +45,7 @@
var/hack_software = FALSE //Will be able to use hacking actions
var/interaction_range = 7 //wireless control range
- var/obj/item/pda/aiPDA
+ var/obj/item/pda/ai/aiPDA
/mob/living/silicon/Initialize()
. = ..()
@@ -68,6 +68,7 @@
QDEL_NULL(radio)
QDEL_NULL(aicamera)
QDEL_NULL(builtInCamera)
+ QDEL_NULL(aiPDA)
GLOB.silicon_mobs -= src
return ..()
diff --git a/code/modules/mob/living/simple_animal/hostile/bees.dm b/code/modules/mob/living/simple_animal/hostile/bees.dm
index dd97f4f8050..38b87eae38c 100644
--- a/code/modules/mob/living/simple_animal/hostile/bees.dm
+++ b/code/modules/mob/living/simple_animal/hostile/bees.dm
@@ -86,6 +86,16 @@
if(!beehome)
. += "This bee is homeless!"
+/mob/living/simple_animal/hostile/poison/bees/ListTargets() // Bee processing is expessive, so we override them finding targets here.
+ if(!search_objects) //In case we want to have purely hostile bees
+ return ..()
+ else
+ . = list() // The following code is only very slightly slower than just returning oview(vision_range, targets_from), but it saves us much more work down the line
+ var/list/searched_for = oview(vision_range, targets_from)
+ for(var/obj/A in searched_for)
+ . += A
+ for(var/mob/A in searched_for)
+ . += A
/mob/living/simple_animal/hostile/poison/bees/proc/generate_bee_visuals()
cut_overlays()
diff --git a/code/modules/mob/living/simple_animal/hostile/hostile.dm b/code/modules/mob/living/simple_animal/hostile/hostile.dm
index ca0a96a8dee..2f1a51cd09d 100644
--- a/code/modules/mob/living/simple_animal/hostile/hostile.dm
+++ b/code/modules/mob/living/simple_animal/hostile/hostile.dm
@@ -127,7 +127,7 @@
//////////////HOSTILE MOB TARGETTING AND AGGRESSION////////////
-/mob/living/simple_animal/hostile/proc/ListTargets()//Step 1, find out what we can see
+/mob/living/simple_animal/hostile/proc/ListTargets() //Step 1, find out what we can see
if(!search_objects)
. = hearers(vision_range, targets_from) - src //Remove self, so we don't suicide
@@ -137,11 +137,7 @@
if(can_see(targets_from, HM, vision_range))
. += HM
else
- . = list() // The following code is only very slightly slower than just returning oview(vision_range, targets_from), but it saves us much more work down the line, particularly when bees are involved
- for (var/obj/A in oview(vision_range, targets_from))
- . += A
- for (var/mob/A in oview(vision_range, targets_from))
- . += A
+ . = oview(vision_range, targets_from)
/mob/living/simple_animal/hostile/proc/FindTarget(list/possible_targets, HasTargetsList = 0)//Step 2, filter down possible targets to things we actually care about
. = list()
diff --git a/code/modules/mob/living/simple_animal/hostile/megafauna/bubblegum.dm b/code/modules/mob/living/simple_animal/hostile/megafauna/bubblegum.dm
index c35aafaec39..e9d2c97f02d 100644
--- a/code/modules/mob/living/simple_animal/hostile/megafauna/bubblegum.dm
+++ b/code/modules/mob/living/simple_animal/hostile/megafauna/bubblegum.dm
@@ -72,13 +72,6 @@ Difficulty: Hard
/datum/action/innate/megafauna_attack/blood_warp)
small_sprite_type = /datum/action/small_sprite/megafauna/bubblegum
-/mob/living/simple_animal/hostile/megafauna/bubblegum/Initialize()
- . = ..()
- if(true_spawn)
- for(var/mob/living/simple_animal/hostile/megafauna/bubblegum/B in GLOB.mob_living_list)
- if(B != src)
- return INITIALIZE_HINT_QDEL //There can be only one
-
/datum/action/innate/megafauna_attack/triple_charge
name = "Triple Charge"
icon_icon = 'icons/mob/actions/actions_items.dmi'
diff --git a/code/modules/mob/status_procs.dm b/code/modules/mob/status_procs.dm
index 7019ba8ab98..0561641318f 100644
--- a/code/modules/mob/status_procs.dm
+++ b/code/modules/mob/status_procs.dm
@@ -32,7 +32,7 @@
*/
/mob/proc/adjust_blindness(amount)
var/old_eye_blind = eye_blind
- eye_blind += amount
+ eye_blind = max(0, eye_blind + amount)
if(!old_eye_blind || !eye_blind && !HAS_TRAIT(src, TRAIT_BLIND))
update_blindness()
/**
diff --git a/code/modules/projectiles/guns/ballistic/shotgun.dm b/code/modules/projectiles/guns/ballistic/shotgun.dm
index 617ef3bd8eb..cd10fe3c46b 100644
--- a/code/modules/projectiles/guns/ballistic/shotgun.dm
+++ b/code/modules/projectiles/guns/ballistic/shotgun.dm
@@ -216,7 +216,7 @@
/obj/item/gun/ballistic/shotgun/doublebarrel/improvised/sawn
name = "sawn-off improvised shotgun"
desc = "A single-shot shotgun. Better not miss."
- icon_state = "ishotgun" //_sawn
+ icon_state = "ishotgun_sawn"
item_state = "ishotgun_sawn"
w_class = WEIGHT_CLASS_NORMAL
sawn_off = TRUE
diff --git a/code/modules/reagents/chemistry/reagents/cat2_medicine_reagents.dm b/code/modules/reagents/chemistry/reagents/cat2_medicine_reagents.dm
index e6a8f7ce578..ef5e6a22ab5 100644
--- a/code/modules/reagents/chemistry/reagents/cat2_medicine_reagents.dm
+++ b/code/modules/reagents/chemistry/reagents/cat2_medicine_reagents.dm
@@ -179,47 +179,47 @@
/******TOXIN******/
/*Suffix: -iver*/
-/datum/reagent/medicine/C2/fiziver //fiz = phys ok?
- name = "Fiziver"
- description = "An antitoxin that temporarily weakens the user, making them susceptible to other forms of damage. Weakness and toxin healing scales with length of exposure."
- overdose_threshold = 11
- metabolization_rate = 0.25 * REAGENTS_METABOLISM //so that the weakness from a 10u pill will last for around 3 minutes or so
- var/weak_mod = 1
+/datum/reagent/medicine/C2/seiver //a bit of a gray joke
+ name = "Seiver"
+ description = "A medicine that shifts functionality based on temperature. Colder temperatures incurs radiation removal while hotter temperatures promote antitoxicity. Damages the heart." //CHEM HOLDER TEMPS, NOT AIR TEMPS
+ var/radbonustemp = (T0C - 100) //being below this number gives you 10% off rads.
-/datum/reagent/medicine/C2/fiziver/on_mob_life(mob/living/carbon/human/M)
- var/datum/physiology/phis = M.physiology
- phis.brute_mod /= weak_mod
- phis.burn_mod /= weak_mod
- phis.oxy_mod /= weak_mod
- phis.stamina_mod /= weak_mod
- weak_mod = min(3, (1+(current_cycle*0.04)))
- phis.brute_mod *= weak_mod
- phis.burn_mod *= weak_mod
- phis.oxy_mod *= weak_mod
- phis.stamina_mod *= weak_mod
- M.adjustToxLoss(-0.3*weak_mod) //Math is fun if you your PR doesn't accidentally get testmerged before you can test the effects of your equations!
+/datum/reagent/medicine/C2/seiver/on_mob_metabolize(mob/living/carbon/human/M)
+ . = ..()
+ radbonustemp = rand(radbonustemp - 50, radbonustemp + 50) // Basically this means 50K and below will always give the percent heal, and upto 150K could. Calculated once.
+
+/datum/reagent/medicine/C2/seiver/on_mob_life(mob/living/carbon/human/M)
+ var/chemtemp = min(M.reagents?.chem_temp, 1000)
+ chemtemp = chemtemp ? chemtemp : 273 //why do you have null sweaty
+ var/healypoints = 0 //5 healypoints = 1 heart damage; 5 rads = 1 tox damage healed for the purpose of healypoints
+
+ //you're hot
+ var/toxcalc = min(round((chemtemp-1000)/175+5,0.1),5) //max 5 tox healing a tick
+ if(toxcalc > 0)
+ M.adjustToxLoss(toxcalc*-1)
+ healypoints += toxcalc
+
+ //and you're cold
+ var/radcalc = round((T0C-chemtemp)/6,0.1) //max ~45 rad loss unless you've hit below 0K. if so, wow.
+ if(radcalc > 0)
+ //no cost percent healing if you are SUPER cold (on top of cost healing)
+ if(chemtemp < radbonustemp*0.1) //if you're super chilly, it takes off 25% of your current rads
+ M.radiation = round(M.radiation * 0.75)
+ else if(chemtemp < radbonustemp)//else if you're under the chill-zone, it takes off 10% of your current rads
+ M.radiation = round(M.radiation * 0.25)
+ M.radiation -= radcalc
+ healypoints += (radcalc/5)
+
+
+ //you're yes and... oh no!
+ healypoints = round(healypoints,0.1)
+ M.adjustOrganLoss(ORGAN_SLOT_HEART, healypoints/5)
..()
return TRUE
-/datum/reagent/medicine/C2/fiziver/on_mob_delete(mob/living/carbon/human/M) //I was considering adding an on_mob_add counterpart to this, but it shouldn't ever be needed... right?
- var/datum/physiology/phis = M.physiology
- phis.brute_mod /= weak_mod //apparently, physiology stats are independent of species stats, so nothing bad should happen if someone changes race or something while this chem is in their system... hopefully
- phis.burn_mod /= weak_mod
- phis.oxy_mod /= weak_mod
- phis.stamina_mod /= weak_mod
- return ..()
-
-/datum/reagent/medicine/C2/fiziver/overdose_process(mob/living/carbon/human/M)
- if(prob(50))
- M.adjustBruteLoss(0.2) //the damage from these will, of course, be increased by the brute_mod and burn_mod adjustments
- M.adjustFireLoss(0.2)
- ..()
- return TRUE
-
-
-/datum/reagent/medicine/C2/multiver //amplified with MULTIple medicines
+/datum/reagent/medicine/C2/multiver //enhanced with MULTIple medicines
name = "Multiver"
- description = "An antitoxin that scales with the more unique medicines in the body as well as purges chems (including itself). Causes lung damage."
+ description = "A chem-purger that becomes more effective the more unique medicines present. Slightly heals toxicity but causes lung damage (mitigatable by unique medicines)."
/datum/reagent/medicine/C2/multiver/on_mob_life(mob/living/carbon/human/M)
var/medibonus = 0 //it will always have itself which makes it REALLY start @ 1
@@ -227,13 +227,22 @@
var/datum/reagent/the_reagent = r
if(istype(the_reagent, /datum/reagent/medicine))
medibonus += 1
- M.adjustToxLoss(-0.5 * medibonus)
- M.adjustOrganLoss(ORGAN_SLOT_LUNGS, medibonus)
- for(var/datum/reagent/R in M.reagents.reagent_list)
- M.reagents.remove_reagent(R.type, medibonus*0.5)
+ M.adjustToxLoss(-0.2 * medibonus)
+ M.adjustOrganLoss(ORGAN_SLOT_LUNGS, medibonus ? 2.5/medibonus : 1)
+ for(var/datum/reagent/the_reagent2 in M.reagents.reagent_list)
+ if(the_reagent2 == src)
+ continue
+ var/amount2purge = medibonus*0.1
+ if(istype(the_reagent2,/datum/reagent/toxin))
+ amount2purge *= 5 //very good antitox (well just removing them) for roundstart availability
+ else if(medibonus >= 5 && istype(the_reagent2, /datum/reagent/medicine)) //5 unique meds (4+multiver) will make it not purge medicines
+ continue
+ M.reagents.remove_reagent(the_reagent2.type, amount2purge)
..()
return TRUE
+#define issyrinormusc(A) (istype(A,/datum/reagent/medicine/C2/syriniver) || istype(A,/datum/reagent/medicine/C2/musiver)) //musc is metab of syrin so let's make sure we're not purging either
+
/datum/reagent/medicine/C2/syriniver //Inject >> SYRINge
name = "Syriniver"
description = "A potent antidote for intravenous use with a narrow therapeutic index, it is considered an active prodrug of musiver."
@@ -260,8 +269,10 @@
/datum/reagent/medicine/C2/syriniver/on_mob_life(mob/living/carbon/M)
M.adjustOrganLoss(ORGAN_SLOT_LIVER, 0.8)
M.adjustToxLoss(-1*REM, 0)
- for(var/datum/reagent/toxin/R in M.reagents.reagent_list)
- M.reagents.remove_reagent(R.type,1)
+ for(var/datum/reagent/R in M.reagents.reagent_list)
+ if(issyrinormusc(R))
+ continue
+ M.reagents.remove_reagent(R.type,0.4)
..()
. = 1
@@ -285,8 +296,10 @@
/datum/reagent/medicine/C2/musiver/on_mob_life(mob/living/carbon/M)
M.adjustOrganLoss(ORGAN_SLOT_LIVER, 0.1)
M.adjustToxLoss(-1*REM, 0)
- for(var/datum/reagent/toxin/R in M.reagents.reagent_list)
- M.reagents.remove_reagent(R.type,1)
+ for(var/datum/reagent/R in M.reagents.reagent_list)
+ if(issyrinormusc(R))
+ continue
+ M.reagents.remove_reagent(R.type,0.2)
..()
. = 1
@@ -306,6 +319,7 @@
..()
. = 1
+#undef issyrinormusc
/******COMBOS******/
/*Suffix: Combo of healing, prob gonna get wack REAL fast*/
/datum/reagent/medicine/C2/instabitaluri
diff --git a/code/modules/reagents/chemistry/reagents/food_reagents.dm b/code/modules/reagents/chemistry/reagents/food_reagents.dm
index 5df92e3f573..d519ce255c5 100755
--- a/code/modules/reagents/chemistry/reagents/food_reagents.dm
+++ b/code/modules/reagents/chemistry/reagents/food_reagents.dm
@@ -748,4 +748,13 @@
/datum/reagent/consumable/char/overdose_process(mob/living/carbon/M)
if(prob(10))
M.say(pick("I hate my wife.", "I just want to grill for God's sake.", "I wish I could just go on my lawnmower and cut the grass.", "Yep, Quake. That was a good game...", "Yeah, my PDA has wi-fi. A wife I hate."), forced = /datum/reagent/consumable/char)
- ..()
\ No newline at end of file
+ ..()
+
+
+/datum/reagent/consumable/bbqsauce
+ name = "BBQ Sauce"
+ description = "Sweet, Smokey, Savory, and gets everywhere. Perfect for Grilling."
+ nutriment_factor = 5 * REAGENTS_METABOLISM
+ color = "#78280A" // rgb: 120 40, 10
+ taste_mult = 2.5 //sugar's 1.5, capsacin's 1.5, so a good middle ground.
+ taste_description = "smokey sweetness"
diff --git a/code/modules/reagents/chemistry/recipes/cat2_medicines.dm b/code/modules/reagents/chemistry/recipes/cat2_medicines.dm
index f8a88ee5799..be3f08b6d86 100644
--- a/code/modules/reagents/chemistry/recipes/cat2_medicines.dm
+++ b/code/modules/reagents/chemistry/recipes/cat2_medicines.dm
@@ -48,10 +48,10 @@
/*****TOX*****/
-/datum/chemical_reaction/fiziver
+/datum/chemical_reaction/seiver
name = "Fiziver"
- id = /datum/reagent/medicine/C2/fiziver
- results = list(/datum/reagent/medicine/C2/fiziver = 3)
+ id = /datum/reagent/medicine/C2/seiver
+ results = list(/datum/reagent/medicine/C2/seiver = 3)
required_reagents = list(/datum/reagent/nitrogen = 1, /datum/reagent/potassium = 1, /datum/reagent/aluminium = 1)
/datum/chemical_reaction/multiver
diff --git a/code/modules/reagents/reagent_containers/bottle.dm b/code/modules/reagents/reagent_containers/bottle.dm
index 763261d2d02..d2f03cb8ea1 100644
--- a/code/modules/reagents/reagent_containers/bottle.dm
+++ b/code/modules/reagents/reagent_containers/bottle.dm
@@ -57,6 +57,11 @@
desc = "A small bottle of multiver, which removes toxins and other chemicals from the bloodstream but causes shortness of breath. All effects scale with the amount of reagents in the patient."
list_reagents = list(/datum/reagent/medicine/C2/multiver = 30)
+/obj/item/reagent_containers/glass/bottle/syriniver
+ name = "syriniver bottle"
+ desc = "A small bottle of syriniver."
+ list_reagents = list(/datum/reagent/medicine/C2/syriniver = 30)
+
/obj/item/reagent_containers/glass/bottle/mutagen
name = "unstable mutagen bottle"
desc = "A small bottle of unstable mutagen. Randomly changes the DNA structure of whoever comes in contact."
diff --git a/code/modules/research/designs/autolathe_designs.dm b/code/modules/research/designs/autolathe_designs.dm
index 58731c49994..6deece3441a 100644
--- a/code/modules/research/designs/autolathe_designs.dm
+++ b/code/modules/research/designs/autolathe_designs.dm
@@ -488,15 +488,6 @@
category = list("initial", "Medical", "Medical Designs")
departmental_flags = DEPARTMENTAL_FLAG_MEDICAL | DEPARTMENTAL_FLAG_SERVICE
-/datum/design/healthanalyzer
- name = "Health Analyzer"
- id = "healthanalyzer"
- build_type = AUTOLATHE | PROTOLATHE
- materials = list(/datum/material/iron = 500, /datum/material/glass = 50)
- build_path = /obj/item/healthanalyzer
- category = list("initial", "Medical", "Medical Designs")
- departmental_flags = DEPARTMENTAL_FLAG_MEDICAL
-
/datum/design/pillbottle
name = "Pill Bottle"
id = "pillbottle"
diff --git a/code/modules/research/designs/medical_designs.dm b/code/modules/research/designs/medical_designs.dm
index 1b45d34d47a..ad41674f246 100644
--- a/code/modules/research/designs/medical_designs.dm
+++ b/code/modules/research/designs/medical_designs.dm
@@ -2,6 +2,15 @@
////////////Medical Tools////////////////
/////////////////////////////////////////
+/datum/design/healthanalyzer
+ name = "Health Analyzer"
+ id = "healthanalyzer"
+ build_type = PROTOLATHE
+ materials = list(/datum/material/iron = 500, /datum/material/glass = 50)
+ build_path = /obj/item/healthanalyzer
+ category = list("Medical Designs")
+ departmental_flags = DEPARTMENTAL_FLAG_MEDICAL
+
/datum/design/mmi
name = "Man-Machine Interface"
desc = "The Warrior's bland acronym, MMI, obscures the true horror of this monstrosity."
diff --git a/code/modules/spells/spell_types/personality_commune.dm b/code/modules/spells/spell_types/personality_commune.dm
new file mode 100644
index 00000000000..d7005b65107
--- /dev/null
+++ b/code/modules/spells/spell_types/personality_commune.dm
@@ -0,0 +1,32 @@
+/obj/effect/proc_holder/spell/targeted/personality_commune
+ name = "Personality Commune"
+ desc = "Sends thoughts to your alternate consciousness."
+ charge_max = 0
+ clothes_req = FALSE
+ range = -1
+ include_user = TRUE
+ action_icon_state = "telepathy"
+ action_background_icon_state = "bg_spell"
+ var/datum/brain_trauma/severe/split_personality/trauma
+ var/flufftext = "You hear an echoing voice in the back of your head..."
+
+/obj/effect/proc_holder/spell/targeted/personality_commune/New(datum/brain_trauma/severe/split_personality/T)
+ . = ..()
+ trauma = T
+
+// Pillaged and adapted from telepathy code
+/obj/effect/proc_holder/spell/targeted/personality_commune/cast(list/targets, mob/user)
+ if(!istype(trauma))
+ to_chat(user, "Something is wrong; Either due a bug or admemes, you are trying to cast this spell without a split personality!")
+ return
+ var/msg = stripped_input(usr, "What would you like to tell your other self?", null , "")
+ if(!msg)
+ charge_counter = charge_max
+ return
+ to_chat(user, "You concentrate and send thoughts to your other self: [msg]")
+ to_chat(trauma.owner, "[flufftext] [msg]")
+ log_directed_talk(user, trauma.owner, msg, LOG_SAY ,"[name]")
+ for(var/ded in GLOB.dead_mob_list)
+ if(!isobserver(ded))
+ continue
+ to_chat(ded, "[FOLLOW_LINK(ded, user)] [user] [name]: \"[msg]\" to[trauma]")
diff --git a/code/modules/spells/spell_types/wizard.dm b/code/modules/spells/spell_types/wizard.dm
index 63e71bdd5d7..29dd3193fca 100644
--- a/code/modules/spells/spell_types/wizard.dm
+++ b/code/modules/spells/spell_types/wizard.dm
@@ -259,7 +259,9 @@
/obj/effect/proc_holder/spell/targeted/genetic/blind
mutations = list(BLINDMUT)
duration = 300
+ charge_max = 400 // needs to be higher than the duration or it'll be permanent
sound = 'sound/magic/blind.ogg'
+
/obj/effect/proc_holder/spell/aoe_turf/repulse
name = "Repulse"
desc = "This spell throws everything around the user away."
diff --git a/code/modules/surgery/tools.dm b/code/modules/surgery/tools.dm
index 042290f9997..e1401e01222 100644
--- a/code/modules/surgery/tools.dm
+++ b/code/modules/surgery/tools.dm
@@ -271,6 +271,7 @@
icon_state = "scalpel_a"
/obj/item/scalpel/advanced/examine()
+ . = ..()
. += " It's set to [tool_behaviour == TOOL_SCALPEL ? "scalpel" : "saw"] mode."
/obj/item/retractor/advanced
@@ -292,7 +293,8 @@
icon_state = "retractor_a"
/obj/item/retractor/advanced/examine()
- . += " It resembles a retractor[tool_behaviour == TOOL_RETRACTOR ? "retractor" : "hemostat"]."
+ . = ..()
+ . += " It resembles a [tool_behaviour == TOOL_RETRACTOR ? "retractor" : "hemostat"]."
/obj/item/surgicaldrill/advanced
name = "searing tool"
@@ -319,4 +321,5 @@
icon_state = "surgicaldrill_a"
/obj/item/surgicaldrill/advanced/examine()
+ . = ..()
. += " It's set to [tool_behaviour == TOOL_DRILL ? "drilling" : "mending"] mode."
diff --git a/code/modules/vending/medical.dm b/code/modules/vending/medical.dm
index 56b5aaf83c2..8b28899bc98 100644
--- a/code/modules/vending/medical.dm
+++ b/code/modules/vending/medical.dm
@@ -13,7 +13,8 @@
/obj/item/reagent_containers/pill/patch/aiuri = 5,
/obj/item/reagent_containers/syringe/convermol = 2,
/obj/item/reagent_containers/pill/insulin = 5,
- /obj/item/reagent_containers/glass/bottle/multiver = 4,
+ /obj/item/reagent_containers/glass/bottle/multiver = 2,
+ /obj/item/reagent_containers/glass/bottle/syriniver = 2,
/obj/item/reagent_containers/glass/bottle/epinephrine = 3,
/obj/item/reagent_containers/glass/bottle/morphine = 4,
/obj/item/reagent_containers/glass/bottle/potass_iodide = 1,
diff --git a/html/changelog.html b/html/changelog.html
index 722ba7db5c3..1e58bd1af17 100644
--- a/html/changelog.html
+++ b/html/changelog.html
@@ -51,7 +51,125 @@
-->
- 09 October 2019+13 October 2019+4dplanner updated:+
ArcaneMusic updated:+
Arkatos updated:+
Bald People updated:+
Couls updated:+
Fox McCloud updated:+
Ghommie updated:+
MCterra10 updated:+
Skoglol updated:+
Toxicby updated:+
bobbahbrown updated:+
carlarctg updated:+
nemvar updated:+
willox updated:+
12 October 2019+Anonmare updated:+
Fikou updated:+
SynnGraffkin updated:+
YPOQ updated:+
YoYoBatty updated:+
imsxz updated:+
kingofkosmos updated:+
loserXD updated:+
nemvar updated:+
willox updated:+
10 October 2019ArcaneMusic updated:
|