From 528f231f41be444b9ad443d0ec378ef1eee481ee Mon Sep 17 00:00:00 2001 From: Unknown Date: Wed, 27 Jun 2018 15:10:02 -0400 Subject: [PATCH 01/49] Medical Tweaks - Ointment now treats 3 burn damage per application - Advanced Trauma Kits treat 6 damage per application, and have 20 uses - Advanced Burn Kits treat 12 damage per application - Medical Rescue Suit injector now has 20 units per chem, and uses Inaprovaline, Dylovene, Paracematol, and Dexalin - Kelotane effectiveness reduced from 6 damage per tick to 4 damage per tick - Dermaline effectiveness reduced from 12 damage per tick, to 8 damage per tick - Dexalin metabolizes at 20% of the rate of Dexalin Plus, stats adjusted accordingly (Natje's suggestion) - Dexalin is now twice as effective (still pales in comparison to Dex Plus) - Reduced brain healing of Alkysine from 30 to 8 - Vermicetol now works like super tricordazine, healing all damage types at a moderate rate, while metabolizing slowly. Overdose threshold increased from 10u to 15u. - All pre-filled syringes start capped. - There is now a 20-second grace period for infection to start ticking up (Note: Using syringes on multiple people renders grace period null and void) --- code/game/objects/items/stacks/medical.dm | 8 +++++--- .../spacesuits/rig/modules/utility_vr.dm | 10 +++++----- .../Chemistry-Reagents-Medicine.dm | 15 ++++++++------- .../Chemistry-Reagents-Medicine_vr.dm | 13 +++++++++---- .../reagents/reagent_containers/syringes.dm | 16 ++++++++-------- .../reagents/reagent_containers/syringes_vr.dm | 6 +++++- 6 files changed, 40 insertions(+), 28 deletions(-) diff --git a/code/game/objects/items/stacks/medical.dm b/code/game/objects/items/stacks/medical.dm index 391405714c..11ba56c6e5 100644 --- a/code/game/objects/items/stacks/medical.dm +++ b/code/game/objects/items/stacks/medical.dm @@ -130,7 +130,7 @@ gender = PLURAL singular_name = "ointment" icon_state = "ointment" - heal_burn = 1 + heal_burn = 3 origin_tech = list(TECH_BIO = 1) no_variants = FALSE apply_sounds = list('sound/effects/ointment.ogg') @@ -170,7 +170,9 @@ singular_name = "advanced trauma kit" desc = "An advanced trauma kit for severe injuries." icon_state = "traumakit" - heal_brute = 3 + heal_brute = 6 //VOREStation Edit + amount = 20 //VOREStation Edit + max_amount = 20 //VOREStation Edit origin_tech = list(TECH_BIO = 1) apply_sounds = list('sound/effects/rip1.ogg','sound/effects/rip2.ogg','sound/effects/tape.ogg') @@ -233,7 +235,7 @@ singular_name = "advanced burn kit" desc = "An advanced treatment kit for severe burns." icon_state = "burnkit" - heal_burn = 3 + heal_burn = 12 //VOREStation Edit origin_tech = list(TECH_BIO = 1) apply_sounds = list('sound/effects/ointment.ogg') diff --git a/code/modules/clothing/spacesuits/rig/modules/utility_vr.dm b/code/modules/clothing/spacesuits/rig/modules/utility_vr.dm index 83456629a1..21fe6fb9cf 100644 --- a/code/modules/clothing/spacesuits/rig/modules/utility_vr.dm +++ b/code/modules/clothing/spacesuits/rig/modules/utility_vr.dm @@ -104,14 +104,14 @@ interface_name = "mounted chem injector" interface_desc = "Dispenses loaded chemicals via an arm-mounted injector." - var/max_reagent_volume = 10 //Regen to this volume + var/max_reagent_volume = 20 //Regen to this volume var/chems_to_use = 5 //Per injection charges = list( - list("inaprovaline", "inaprovaline", 0, 10), - list("tricordrazine", "tricordrazine", 0, 10), - list("tramadol", "tramadol", 0, 10), - list("dexalin plus", "dexalinp", 0, 10) + list("inaprovaline", "inaprovaline", 0, 20), + list("dylovene", "dylovene", 0, 20), + list("paracetamol", "paracetamol", 0, 20), + list("dexalin", "dexalin", 0, 20) ) /obj/item/rig_module/rescue_pharm/process() diff --git a/code/modules/reagents/Chemistry-Reagents/Chemistry-Reagents-Medicine.dm b/code/modules/reagents/Chemistry-Reagents/Chemistry-Reagents-Medicine.dm index 9de15b6915..e6a786e8e2 100644 --- a/code/modules/reagents/Chemistry-Reagents/Chemistry-Reagents-Medicine.dm +++ b/code/modules/reagents/Chemistry-Reagents/Chemistry-Reagents-Medicine.dm @@ -67,7 +67,7 @@ chem_effective = 0.5 M.adjustBruteLoss(2 * removed) //Mends burns, but has negative effects with a Promethean's skeletal structure. if(alien != IS_DIONA) - M.heal_organ_damage(0, 6 * removed * chem_effective) + M.heal_organ_damage(0, 4 * removed * chem_effective) //VOREStation edit /datum/reagent/dermaline name = "Dermaline" @@ -85,7 +85,7 @@ if(alien == IS_SLIME) chem_effective = 0.75 if(alien != IS_DIONA) - M.heal_organ_damage(0, 12 * removed * chem_effective) + M.heal_organ_damage(0, 8 * removed * chem_effective) //VOREStation edit /datum/reagent/dylovene name = "Dylovene" @@ -141,20 +141,21 @@ color = "#0080FF" overdose = REAGENTS_OVERDOSE scannable = 1 + metabolism = 0.2 //VOREStation Edit /datum/reagent/dexalin/affect_blood(var/mob/living/carbon/M, var/alien, var/removed) if(alien == IS_VOX) - M.adjustToxLoss(removed * 6) + M.adjustToxLoss(removed * 30) //VOREStation Edit else if(alien == IS_SLIME && dose >= 15) M.add_chemical_effect(CE_PAINKILLER, 15) if(prob(15)) to_chat(M, "You have a moment of clarity as you collapse.") - M.adjustBrainLoss(-5 * removed) + M.adjustBrainLoss(-25 * removed) //VOREStation Edit M.Weaken(6) else if(alien != IS_DIONA) - M.adjustOxyLoss(-15 * removed) + M.adjustOxyLoss(-150 * removed) //VOREStation Edit - holder.remove_reagent("lexorin", 2 * removed) + holder.remove_reagent("lexorin", 10 * removed) //VOREStation Edit /datum/reagent/dexalinp name = "Dexalin Plus" @@ -399,7 +400,7 @@ M.Weaken(5) if(dose >= 10 && M.paralysis < 40) M.AdjustParalysis(1) //Messing with the core with a simple chemical probably isn't the best idea. - M.adjustBrainLoss(-30 * removed * chem_effective) + M.adjustBrainLoss(-8 * removed * chem_effective) //VOREStation Edit M.add_chemical_effect(CE_PAINKILLER, 10 * chem_effective) /datum/reagent/imidazoline diff --git a/code/modules/reagents/Chemistry-Reagents/Chemistry-Reagents-Medicine_vr.dm b/code/modules/reagents/Chemistry-Reagents/Chemistry-Reagents-Medicine_vr.dm index e57d7ae582..831a1713f7 100644 --- a/code/modules/reagents/Chemistry-Reagents/Chemistry-Reagents-Medicine_vr.dm +++ b/code/modules/reagents/Chemistry-Reagents/Chemistry-Reagents-Medicine_vr.dm @@ -62,15 +62,20 @@ /datum/reagent/vermicetol name = "Vermicetol" id = "vermicetol" - description = "A potent chemical that treats burn damage at an exceptional rate and lasts a while." + description = "A potent chemical that treats all damage at an exceptional rate and lasts a while." taste_description = "sparkles" reagent_state = SOLID color = "#964e06" - overdose = 10 + overdose = 15 scannable = 1 - metabolism = 0.02 + metabolism = 0.05 mrate_static = TRUE /datum/reagent/vermicetol/affect_blood(var/mob/living/carbon/M, var/alien, var/removed) if(alien != IS_DIONA) - M.heal_organ_damage(0, 110 * removed) //Not as potent as Kelotane, but lasts LONG. + var/chem_effective = 1 + if(alien == IS_SLIME) + chem_effective = 0.5 + M.heal_organ_damage(60 * removed, 60 * removed * chem_effective) + M.adjustOxyLoss(-120 * removed * chem_effective) + M.adjustToxLoss(-60 * removed * chem_effective) diff --git a/code/modules/reagents/reagent_containers/syringes.dm b/code/modules/reagents/reagent_containers/syringes.dm index 68cc9d6921..3632922d1b 100644 --- a/code/modules/reagents/reagent_containers/syringes.dm +++ b/code/modules/reagents/reagent_containers/syringes.dm @@ -333,8 +333,8 @@ /obj/item/weapon/reagent_containers/syringe/inaprovaline/New() ..() reagents.add_reagent("inaprovaline", 15) - mode = SYRINGE_INJECT - update_icon() + //mode = SYRINGE_INJECT //VOREStation Edit - Starts capped + //update_icon() /obj/item/weapon/reagent_containers/syringe/antitoxin name = "Syringe (anti-toxin)" @@ -343,8 +343,8 @@ /obj/item/weapon/reagent_containers/syringe/antitoxin/New() ..() reagents.add_reagent("anti_toxin", 15) - mode = SYRINGE_INJECT - update_icon() + //mode = SYRINGE_INJECT //VOREStation Edit - Starts capped + //update_icon() /obj/item/weapon/reagent_containers/syringe/antiviral name = "Syringe (spaceacillin)" @@ -353,8 +353,8 @@ /obj/item/weapon/reagent_containers/syringe/antiviral/New() ..() reagents.add_reagent("spaceacillin", 15) - mode = SYRINGE_INJECT - update_icon() + //mode = SYRINGE_INJECT //VOREStation Edit - Starts capped + //update_icon() /obj/item/weapon/reagent_containers/syringe/drugs name = "Syringe (drugs)" @@ -365,8 +365,8 @@ reagents.add_reagent("space_drugs", 5) reagents.add_reagent("mindbreaker", 5) reagents.add_reagent("cryptobiolin", 5) - mode = SYRINGE_INJECT - update_icon() + //mode = SYRINGE_INJECT //VOREStation Edit - Starts capped + //update_icon() /obj/item/weapon/reagent_containers/syringe/ld50_syringe/choral/New() ..() diff --git a/code/modules/reagents/reagent_containers/syringes_vr.dm b/code/modules/reagents/reagent_containers/syringes_vr.dm index b3c9688919..e940f23454 100644 --- a/code/modules/reagents/reagent_containers/syringes_vr.dm +++ b/code/modules/reagents/reagent_containers/syringes_vr.dm @@ -43,7 +43,11 @@ //Dirtiness should be very low if you're the first injectee. If you're spam-injecting 4 people in a row around you though, //This gives the last one a 30% chance of infection. - if(prob(dirtiness+(targets.len-1)*10)) + var/infect_chance = dirtiness //Start with dirtiness + if(infect_chance <= 10 && (hash in targets)) //Extra fast uses on target is free + infect_chance = 0 + infect_chance += (targets.len-1)*10 //Extra 10% per extra target + if(prob(infect_chance)) log_and_message_admins("[loc] infected [target]'s [eo.name] with \the [src].") infect_limb(eo) From b46a15da4ebc688e717e70a9cfbee7deb8cc80b0 Mon Sep 17 00:00:00 2001 From: Unknown Date: Wed, 27 Jun 2018 15:36:09 -0400 Subject: [PATCH 02/49] Further Dex Tweaks --- .../Chemistry-Reagents/Chemistry-Reagents-Medicine.dm | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/code/modules/reagents/Chemistry-Reagents/Chemistry-Reagents-Medicine.dm b/code/modules/reagents/Chemistry-Reagents/Chemistry-Reagents-Medicine.dm index e6a786e8e2..500cd4cd24 100644 --- a/code/modules/reagents/Chemistry-Reagents/Chemistry-Reagents-Medicine.dm +++ b/code/modules/reagents/Chemistry-Reagents/Chemistry-Reagents-Medicine.dm @@ -141,21 +141,21 @@ color = "#0080FF" overdose = REAGENTS_OVERDOSE scannable = 1 - metabolism = 0.2 //VOREStation Edit + metabolism = REM * 0.25 //VOREStation Edit /datum/reagent/dexalin/affect_blood(var/mob/living/carbon/M, var/alien, var/removed) if(alien == IS_VOX) - M.adjustToxLoss(removed * 30) //VOREStation Edit + M.adjustToxLoss(removed * 24) //VOREStation Edit else if(alien == IS_SLIME && dose >= 15) M.add_chemical_effect(CE_PAINKILLER, 15) if(prob(15)) to_chat(M, "You have a moment of clarity as you collapse.") - M.adjustBrainLoss(-25 * removed) //VOREStation Edit + M.adjustBrainLoss(-20 * removed) //VOREStation Edit M.Weaken(6) else if(alien != IS_DIONA) - M.adjustOxyLoss(-150 * removed) //VOREStation Edit + M.adjustOxyLoss(-60 * removed) //VOREStation Edit - holder.remove_reagent("lexorin", 10 * removed) //VOREStation Edit + holder.remove_reagent("lexorin", 8 * removed) //VOREStation Edit /datum/reagent/dexalinp name = "Dexalin Plus" From 51142c08d2a1b830e834bca57234c5a845c85d4f Mon Sep 17 00:00:00 2001 From: Unknown Date: Wed, 27 Jun 2018 15:44:29 -0400 Subject: [PATCH 03/49] Gauze Tweak --- code/game/objects/items/stacks/medical.dm | 2 ++ 1 file changed, 2 insertions(+) diff --git a/code/game/objects/items/stacks/medical.dm b/code/game/objects/items/stacks/medical.dm index 11ba56c6e5..eba6c10eb5 100644 --- a/code/game/objects/items/stacks/medical.dm +++ b/code/game/objects/items/stacks/medical.dm @@ -64,6 +64,8 @@ singular_name = "gauze length" desc = "Some sterile gauze to wrap around bloody stumps." icon_state = "brutepack" + amount = 15 //VOREStation Edit + max_amount = 15 //VOREStation Edit origin_tech = list(TECH_BIO = 1) no_variants = FALSE apply_sounds = list('sound/effects/rip1.ogg','sound/effects/rip2.ogg') From 729ed3177b0b303848d70f3841a5d87cff5df8e6 Mon Sep 17 00:00:00 2001 From: Unknown Date: Wed, 27 Jun 2018 16:51:20 -0400 Subject: [PATCH 04/49] Suggested Tweaks --- code/game/objects/items/stacks/medical.dm | 16 ++++++---------- 1 file changed, 6 insertions(+), 10 deletions(-) diff --git a/code/game/objects/items/stacks/medical.dm b/code/game/objects/items/stacks/medical.dm index eba6c10eb5..a9c5c1bc54 100644 --- a/code/game/objects/items/stacks/medical.dm +++ b/code/game/objects/items/stacks/medical.dm @@ -64,8 +64,6 @@ singular_name = "gauze length" desc = "Some sterile gauze to wrap around bloody stumps." icon_state = "brutepack" - amount = 15 //VOREStation Edit - max_amount = 15 //VOREStation Edit origin_tech = list(TECH_BIO = 1) no_variants = FALSE apply_sounds = list('sound/effects/rip1.ogg','sound/effects/rip2.ogg') @@ -132,7 +130,7 @@ gender = PLURAL singular_name = "ointment" icon_state = "ointment" - heal_burn = 3 + heal_burn = 1 origin_tech = list(TECH_BIO = 1) no_variants = FALSE apply_sounds = list('sound/effects/ointment.ogg') @@ -172,9 +170,7 @@ singular_name = "advanced trauma kit" desc = "An advanced trauma kit for severe injuries." icon_state = "traumakit" - heal_brute = 6 //VOREStation Edit - amount = 20 //VOREStation Edit - max_amount = 20 //VOREStation Edit + heal_brute = 5 //VOREStation Edit origin_tech = list(TECH_BIO = 1) apply_sounds = list('sound/effects/rip1.ogg','sound/effects/rip2.ogg','sound/effects/tape.ogg') @@ -202,8 +198,8 @@ continue if (W.bandaged && W.disinfected) continue - if(used == amount) - break + //if(used == amount) //VOREStation Edit + // break //VOREStation Edit if(!do_mob(user, M, W.damage/5)) to_chat(user, "You must stand still to bandage wounds.") break @@ -223,7 +219,7 @@ W.disinfect() W.heal_damage(heal_brute) playsound(src, pick(apply_sounds), 25) - used++ + used = 1 //VOREStation Edit affecting.update_damages() if(used == amount) if(affecting.is_bandaged()) @@ -237,7 +233,7 @@ singular_name = "advanced burn kit" desc = "An advanced treatment kit for severe burns." icon_state = "burnkit" - heal_burn = 12 //VOREStation Edit + heal_burn = 7 //VOREStation Edit origin_tech = list(TECH_BIO = 1) apply_sounds = list('sound/effects/ointment.ogg') From 3f63e5933a70a22d0394a4791c4db8419741b244 Mon Sep 17 00:00:00 2001 From: Unknown Date: Wed, 27 Jun 2018 16:54:15 -0400 Subject: [PATCH 05/49] Keep healing same between bruise/burn --- code/game/objects/items/stacks/medical.dm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/code/game/objects/items/stacks/medical.dm b/code/game/objects/items/stacks/medical.dm index a9c5c1bc54..fe09f30410 100644 --- a/code/game/objects/items/stacks/medical.dm +++ b/code/game/objects/items/stacks/medical.dm @@ -170,7 +170,7 @@ singular_name = "advanced trauma kit" desc = "An advanced trauma kit for severe injuries." icon_state = "traumakit" - heal_brute = 5 //VOREStation Edit + heal_brute = 7 //VOREStation Edit origin_tech = list(TECH_BIO = 1) apply_sounds = list('sound/effects/rip1.ogg','sound/effects/rip2.ogg','sound/effects/tape.ogg') From 1af6dbf37646d332746a44e179e491af518a5097 Mon Sep 17 00:00:00 2001 From: Unknown Date: Wed, 27 Jun 2018 22:49:41 -0400 Subject: [PATCH 06/49] Bicard Nerf --- .../reagents/Chemistry-Reagents/Chemistry-Reagents-Medicine.dm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/code/modules/reagents/Chemistry-Reagents/Chemistry-Reagents-Medicine.dm b/code/modules/reagents/Chemistry-Reagents/Chemistry-Reagents-Medicine.dm index 500cd4cd24..c992d0eae2 100644 --- a/code/modules/reagents/Chemistry-Reagents/Chemistry-Reagents-Medicine.dm +++ b/code/modules/reagents/Chemistry-Reagents/Chemistry-Reagents-Medicine.dm @@ -32,7 +32,7 @@ if(alien == IS_SLIME) chem_effective = 0.75 if(alien != IS_DIONA) - M.heal_organ_damage(6 * removed * chem_effective, 0) + M.heal_organ_damage(4 * removed * chem_effective, 0) //VOREStation Edit /datum/reagent/bicaridine/overdose(var/mob/living/carbon/M, var/alien, var/removed) ..() From d57b85c5979dc97a95a54740865c176d800f93d3 Mon Sep 17 00:00:00 2001 From: Unknown Date: Thu, 28 Jun 2018 14:25:20 -0400 Subject: [PATCH 07/49] Vermicetol is now T2 Brute chem --- .../Chemistry-Reagents-Medicine_vr.dm | 17 +++++++---------- 1 file changed, 7 insertions(+), 10 deletions(-) diff --git a/code/modules/reagents/Chemistry-Reagents/Chemistry-Reagents-Medicine_vr.dm b/code/modules/reagents/Chemistry-Reagents/Chemistry-Reagents-Medicine_vr.dm index 831a1713f7..ae4f0b23f8 100644 --- a/code/modules/reagents/Chemistry-Reagents/Chemistry-Reagents-Medicine_vr.dm +++ b/code/modules/reagents/Chemistry-Reagents/Chemistry-Reagents-Medicine_vr.dm @@ -62,20 +62,17 @@ /datum/reagent/vermicetol name = "Vermicetol" id = "vermicetol" - description = "A potent chemical that treats all damage at an exceptional rate and lasts a while." + description = "A potent chemical that treats physical damage at an exceptional rate." taste_description = "sparkles" + taste_mult = 3 reagent_state = SOLID color = "#964e06" - overdose = 15 + overdose = REAGENTS_OVERDOSE * 0.5 scannable = 1 - metabolism = 0.05 - mrate_static = TRUE /datum/reagent/vermicetol/affect_blood(var/mob/living/carbon/M, var/alien, var/removed) + var/chem_effective = 1 + if(alien == IS_SLIME) + chem_effective = 0.75 if(alien != IS_DIONA) - var/chem_effective = 1 - if(alien == IS_SLIME) - chem_effective = 0.5 - M.heal_organ_damage(60 * removed, 60 * removed * chem_effective) - M.adjustOxyLoss(-120 * removed * chem_effective) - M.adjustToxLoss(-60 * removed * chem_effective) + M.heal_organ_damage(8 * removed * chem_effective, 0) From 8b813107c1cfdba5d8e000985639c2db2134c55a Mon Sep 17 00:00:00 2001 From: Anewbe Date: Fri, 29 Jun 2018 14:49:16 -0500 Subject: [PATCH 08/49] Merge pull request #5361 from Novacat/spriteadd Ports Siik'Tajr from Baystation --- code/__defines/species_languages.dm | 1 + code/modules/mob/language/station.dm | 8 ++++++++ .../mob/living/carbon/human/species/station/station.dm | 2 +- 3 files changed, 10 insertions(+), 1 deletion(-) diff --git a/code/__defines/species_languages.dm b/code/__defines/species_languages.dm index 81a55f84d7..89078a4ddb 100644 --- a/code/__defines/species_languages.dm +++ b/code/__defines/species_languages.dm @@ -50,6 +50,7 @@ #define LANGUAGE_MINBUS "Minbus" #define LANGUAGE_EVENT1 "Occursus" #define LANGUAGE_AKHANI "Akhani" +#define LANGUAGE_SIIK_TAJR "Siik'Tajr" // Language flags. #define WHITELISTED 1 // Language is available if the speaker is whitelisted. diff --git a/code/modules/mob/language/station.dm b/code/modules/mob/language/station.dm index 6de7a9d309..8ce1615414 100644 --- a/code/modules/mob/language/station.dm +++ b/code/modules/mob/language/station.dm @@ -77,6 +77,14 @@ "kar","yar","kzar","rha","hrar","err","fer","rir","rar","yarr","arr","ii'r","jar","kur","ran","rii","ii", "nai","ou","kah","oa","ama","uuk","bel","chi","ayt","kay","kas","akor","tam","yir","enai") +/datum/language/tajsign + name = LANGUAGE_SIIK_TAJR + desc = "A type of sign language mostly based on tail movements that was used during the Tajaran rebellion." + signlang_verb = list("uses their tail to convey", "gestures with their tail", "gestures with their tail elaborately") + colour = "tajaran" + key = "l" + flags = WHITELISTED | SIGNLANG | NO_STUTTER | NONVERBAL + /datum/language/tajaran/get_random_name(var/gender) var/new_name = ..(gender,1) diff --git a/code/modules/mob/living/carbon/human/species/station/station.dm b/code/modules/mob/living/carbon/human/species/station/station.dm index a3acd5ed09..903e1744e8 100644 --- a/code/modules/mob/living/carbon/human/species/station/station.dm +++ b/code/modules/mob/living/carbon/human/species/station/station.dm @@ -156,7 +156,7 @@ metabolic_rate = 1.1 gluttonous = 1 num_alternate_languages = 3 - secondary_langs = list(LANGUAGE_SIIK, LANGUAGE_AKHANI) + secondary_langs = list(LANGUAGE_SIIK, LANGUAGE_AKHANI, LANGUAGE_SIIK_TAJR) name_language = LANGUAGE_SIIK species_language = LANGUAGE_SIIK health_hud_intensity = 2.5 From a12778d7739ed928610cfa64360476a9aaa73163 Mon Sep 17 00:00:00 2001 From: Layne <31356648+MisterLayne@users.noreply.github.com> Date: Fri, 29 Jun 2018 15:55:13 -0400 Subject: [PATCH 10/49] Only slimes may squish. (#5369) * Clandestine (Original Commit) * Revert "Clandestine (Original Commit)" This reverts commit cdb1abb47b3720e9160a4942a06f1b9036db2c27. * Squish on my slime * Squish on my slime --- code/modules/mob/living/carbon/human/emote.dm | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/code/modules/mob/living/carbon/human/emote.dm b/code/modules/mob/living/carbon/human/emote.dm index 3cef432949..f7391b7b12 100644 --- a/code/modules/mob/living/carbon/human/emote.dm +++ b/code/modules/mob/living/carbon/human/emote.dm @@ -1,6 +1,6 @@ /mob/living/carbon/human/emote(var/act,var/m_type=1,var/message = null) var/param = null - + var/datum/gender/T = gender_datums[get_visible_gender()] if (findtext(act, "-", 1, null)) @@ -80,7 +80,7 @@ //Promethean-only emotes if("squish") - if(!species.bump_flag == SLIME) //That should do, yaya. + if(species.bump_flag != SLIME) //This should definitely do it. src << "You are not a slime thing!" return @@ -739,7 +739,7 @@ set name = "Set Pose" set desc = "Sets a description which will be shown when someone examines you." set category = "IC" - + var/datum/gender/T = gender_datums[get_visible_gender()] pose = sanitize(input(usr, "This is [src]. [T.he]...", "Pose", null) as text) From 14d64a5570b12c2f88e8d95e2a46a1c44ec78ee6 Mon Sep 17 00:00:00 2001 From: Unknown Date: Fri, 29 Jun 2018 16:25:20 -0400 Subject: [PATCH 12/49] Duplicate PR revert and minor bugfix - Reverts Virgo Siik'Tajr, since Polaris decided to implement it upstream - Fixes a bug that caused the Pathfinder's locker script to instead trigger on explorer lockers --- code/__defines/species_languages_vr.dm | 1 - code/modules/mob/language/station_vr.dm | 8 -------- .../mob/living/carbon/human/species/station/station_vr.dm | 1 - maps/southern_cross/structures/closets/misc_vr.dm | 2 +- 4 files changed, 1 insertion(+), 11 deletions(-) diff --git a/code/__defines/species_languages_vr.dm b/code/__defines/species_languages_vr.dm index e93ed879fd..8c5c505f82 100644 --- a/code/__defines/species_languages_vr.dm +++ b/code/__defines/species_languages_vr.dm @@ -4,7 +4,6 @@ #define LANGUAGE_ECUREUILIAN "Ecureuilian" #define LANGUAGE_DAEMON "Daemon" #define LANGUAGE_ENOCHIAN "Enochian" -#define LANGUAGE_SIIK_TAJR "Siik'Tajr" #define LANGUAGE_CHIMPANZEE "Chimpanzee" #define LANGUAGE_NEAERA "Neaera" diff --git a/code/modules/mob/language/station_vr.dm b/code/modules/mob/language/station_vr.dm index 15ec837a09..7c610ab9a2 100644 --- a/code/modules/mob/language/station_vr.dm +++ b/code/modules/mob/language/station_vr.dm @@ -71,14 +71,6 @@ "mihi","wan","six","salve","tartu") machine_understands = FALSE -/datum/language/tajsign - name = LANGUAGE_SIIK_TAJR - desc = "A type of sign language mostly based on tail movements that was used during the Tajaran rebellion." - signlang_verb = list("uses their tail to convey", "gestures with their tail", "gestures with their tail elaborately") - colour = "tajaran" - key = "l" - flags = WHITELISTED | SIGNLANG | NO_STUTTER | NONVERBAL - /datum/language/unathi flags = 0 /datum/language/tajaran diff --git a/code/modules/mob/living/carbon/human/species/station/station_vr.dm b/code/modules/mob/living/carbon/human/species/station/station_vr.dm index 7bbc92e655..133220360b 100644 --- a/code/modules/mob/living/carbon/human/species/station/station_vr.dm +++ b/code/modules/mob/living/carbon/human/species/station/station_vr.dm @@ -313,7 +313,6 @@ icobase = 'icons/mob/human_races/r_tajaran_vr.dmi' deform = 'icons/mob/human_races/r_def_tajaran_vr.dmi' tail_animation = 'icons/mob/species/tajaran/tail_vr.dmi' - secondary_langs = list(LANGUAGE_SIIK, LANGUAGE_AKHANI, LANGUAGE_SIIK_TAJR) color_mult = 1 min_age = 18 gluttonous = 0 //Moving this here so I don't have to fix this conflict every time polaris glances at station.dm diff --git a/maps/southern_cross/structures/closets/misc_vr.dm b/maps/southern_cross/structures/closets/misc_vr.dm index bdc1be0d44..751009ef2e 100644 --- a/maps/southern_cross/structures/closets/misc_vr.dm +++ b/maps/southern_cross/structures/closets/misc_vr.dm @@ -29,7 +29,7 @@ /obj/item/clothing/accessory/holster/machete, /obj/item/weapon/reagent_containers/food/snacks/liquidfood = 2) -/obj/structure/closet/secure_closet/explorer/initialize() +/obj/structure/closet/secure_closet/pathfinder/initialize() if(prob(50)) starts_with += /obj/item/weapon/storage/backpack else From 9d0d0528ad37fa006c8bd791e0ee294e84393c49 Mon Sep 17 00:00:00 2001 From: Atermonera Date: Sat, 30 Jun 2018 15:46:18 -0700 Subject: [PATCH 13/49] Merge pull request #5378 from Anewbe/camera_thieves_reeeeeeeeeeee Apportation checks range again --- .../technomancer/spell_objs_helpers.dm | 2 +- .../technomancer/spells/apportation.dm | 10 +++--- html/changelogs/Anewbe - Apportation.yml | 36 +++++++++++++++++++ 3 files changed, 43 insertions(+), 5 deletions(-) create mode 100644 html/changelogs/Anewbe - Apportation.yml diff --git a/code/game/gamemodes/technomancer/spell_objs_helpers.dm b/code/game/gamemodes/technomancer/spell_objs_helpers.dm index f11c027566..105b3b3e9c 100644 --- a/code/game/gamemodes/technomancer/spell_objs_helpers.dm +++ b/code/game/gamemodes/technomancer/spell_objs_helpers.dm @@ -31,7 +31,7 @@ return TRUE /obj/item/weapon/spell/proc/within_range(var/atom/target, var/max_range = 7) // Beyond 7 is off the screen. - if(range(get_dist(owner, target) <= max_range)) + if(target in view(max_range, owner)) return TRUE return FALSE diff --git a/code/game/gamemodes/technomancer/spells/apportation.dm b/code/game/gamemodes/technomancer/spells/apportation.dm index 9fafc47ae3..452ddc52fa 100644 --- a/code/game/gamemodes/technomancer/spells/apportation.dm +++ b/code/game/gamemodes/technomancer/spells/apportation.dm @@ -21,11 +21,13 @@ if(!AM.loc) //Don't teleport HUD telements to us. return if(AM.anchored) - user << "\The [hit_atom] is firmly secured and anchored, you can't move it!" + to_chat(user, "\The [hit_atom] is firmly secured and anchored, you can't move it!") return + if(!within_range(hit_atom) && !check_for_scepter()) - user << "\The [hit_atom] is too far away." + to_chat(user, "\The [hit_atom] is too far away.") return + //Teleporting an item. if(istype(hit_atom, /obj/item)) var/obj/item/I = hit_atom @@ -47,7 +49,7 @@ //Now let's try to teleport a living mob. else if(istype(hit_atom, /mob/living)) var/mob/living/L = hit_atom - L << "You are teleported towards \the [user]." + to_chat(L, "You are teleported towards \the [user].") var/datum/effect/effect/system/spark_spread/s1 = new /datum/effect/effect/system/spark_spread var/datum/effect/effect/system/spark_spread/s2 = new /datum/effect/effect/system/spark_spread s1.set_up(2, 1, user) @@ -60,7 +62,7 @@ spawn(1 SECOND) if(!user.Adjacent(L)) - user << "\The [L] is out of your reach." + to_chat(user, "\The [L] is out of your reach.") qdel(src) return diff --git a/html/changelogs/Anewbe - Apportation.yml b/html/changelogs/Anewbe - Apportation.yml new file mode 100644 index 0000000000..85607a0932 --- /dev/null +++ b/html/changelogs/Anewbe - Apportation.yml @@ -0,0 +1,36 @@ +################################ +# Example Changelog File +# +# Note: This file, and files beginning with ".", and files that don't end in ".yml" will not be read. If you change this file, you will look really dumb. +# +# Your changelog will be merged with a master changelog. (New stuff added only, and only on the date entry for the day it was merged.) +# When it is, any changes listed below will disappear. +# +# Valid Prefixes: +# bugfix +# wip (For works in progress) +# tweak +# soundadd +# sounddel +# rscadd (general adding of nice things) +# rscdel (general deleting of nice things) +# imageadd +# imagedel +# maptweak +# spellcheck (typo fixes) +# experiment +################################# + +# Your name. +author: Anewbe + +# Optional: Remove this file after generating master changelog. Useful for PR changelogs that won't get used again. +delete-after: True + +# Any changes you've made. See valid prefix list above. +# INDENT WITH TWO SPACES. NOT TABS. SPACES. +# SCREW THIS UP AND IT WON'T WORK. +# Also, all entries are changed into a single [] after a master changelog generation. Just remove the brackets when you add new entries. +# Please surround your changes in double quotes ("), as certain characters otherwise screws up compiling. The quotes will not show up in the changelog. +changes: + - bugfix: "Technomancer Apportation now properly checks for range and scepter, again." From 42ecd625b00a5f5327cb20dad1a5b6b218d1f075 Mon Sep 17 00:00:00 2001 From: Jakksergal Date: Sat, 30 Jun 2018 21:11:17 -0700 Subject: [PATCH 15/49] Security Overhaul --- icons/turf/flooring/decals_vr.dmi | Bin 94933 -> 94935 bytes maps/tether/tether-05-station1.dmm | 66 +- maps/tether/tether-06-station2.dmm | 8417 +++---- maps/tether/tether-07-station3.dmm | 33148 +++++++++++++++------------ maps/tether/tether_areas.dm | 6 +- maps/tether/tether_areas2.dm | 17 +- maps/tether/tether_things.dm | 4 +- 7 files changed, 22709 insertions(+), 18949 deletions(-) diff --git a/icons/turf/flooring/decals_vr.dmi b/icons/turf/flooring/decals_vr.dmi index 8c8946d7d88ae393c9068830da7e4d033e620f6a..3547dc439160627b01997533a2a362ae182a4332 100644 GIT binary patch delta 98 zcmV-o0G