" diff --git a/code/datums/mood_events/generic_negative_events.dm b/code/datums/mood_events/generic_negative_events.dm index 94a64c3bd4..a6e4c8ed4f 100644 --- a/code/datums/mood_events/generic_negative_events.dm +++ b/code/datums/mood_events/generic_negative_events.dm @@ -198,3 +198,48 @@ description = "It feels quite cold out here.\n" mood_change = -2 timeout = 1 MINUTES + +/datum/mood_event/vampcandle + description = "Something is making your mind feel... loose...\n" + mood_change = -10 + timeout = 1 MINUTES + +/datum/mood_event/drankblood_bad + description = "I drank the blood of a lesser creature. Disgusting.\n" + mood_change = -4 + timeout = 900 + +/datum/mood_event/drankblood_dead + description = "I drank dead blood. I am better than this.\n" + mood_change = -7 + timeout = 900 + +/datum/mood_event/drankblood_synth + description = "I drank synthetic blood. What is wrong with me?\n" + mood_change = -7 + timeout = 900 + +/datum/mood_event/drankkilled + description = "I drank from my victim until they died. I feel...less human.\n" + mood_change = -12 + timeout = 6000 + +/datum/mood_event/madevamp + description = "A soul has been cursed to undeath by my own hand.\n" + mood_change = -10 + timeout = 10000 + +/datum/mood_event/vampatefood + description = "Mortal nourishment no longer sustains me. I feel unwell.\n" + mood_change = -6 + timeout = 1000 + +/datum/mood_event/daylight_1 + description = "I slept poorly in a makeshift coffin during the day.\n" + mood_change = -3 + timeout = 1000 + +/datum/mood_event/daylight_2 + description = "I have been scorched by the unforgiving rays of the sun.\n" + mood_change = -6 + timeout = 1200 diff --git a/code/datums/mood_events/generic_positive_events.dm b/code/datums/mood_events/generic_positive_events.dm index 9ae7ba2289..94fd08535f 100644 --- a/code/datums/mood_events/generic_positive_events.dm +++ b/code/datums/mood_events/generic_positive_events.dm @@ -134,6 +134,22 @@ mood_change = 3 timeout = 3000 +/datum/mood_event/breakfast + description = "Nothing like a hearty breakfast to start the shift.\n" + mood_change = 2 + timeout = 15 MINUTES + +//Power gamer stuff below +/datum/mood_event/drankblood + description = "I have fed greedly from that which nourishes me.\n" + mood_change = 10 + timeout = 900 + +/datum/mood_event/coffinsleep + description = "I slept in a coffin during the day. I feel whole again.\n" + mood_change = 8 + timeout = 1200 + //Cursed stuff below. /datum/mood_event/orgasm @@ -148,3 +164,8 @@ /datum/mood_event/fedprey description = "It feels quite cozy in here.\n" mood_change = 3 + +/datum/mood_event/hope_lavaland + description = "What a peculiar emblem. It makes me feel hopeful for my future.\n" + mood_change = 5 + diff --git a/code/datums/mutations/hulk.dm b/code/datums/mutations/hulk.dm index 85cecca489..c536196e95 100644 --- a/code/datums/mutations/hulk.dm +++ b/code/datums/mutations/hulk.dm @@ -5,7 +5,7 @@ get_chance = 15 lowest_value = 256 * 12 text_gain_indication = "Your muscles hurt!" - species_allowed = list("human") //no skeleton/lizard hulk + species_allowed = list("fly") //no skeleton/lizard hulk health_req = 25 /datum/mutation/human/hulk/on_acquiring(mob/living/carbon/human/owner) @@ -13,6 +13,7 @@ return ADD_TRAIT(owner, TRAIT_STUNIMMUNE, TRAIT_HULK) ADD_TRAIT(owner, TRAIT_PUSHIMMUNE, TRAIT_HULK) + ADD_TRAIT(owner, TRAIT_CHUNKYFINGERS, TRAIT_HULK) owner.update_body_parts() SEND_SIGNAL(owner, COMSIG_ADD_MOOD_EVENT, "hulk", /datum/mood_event/hulk) RegisterSignal(owner, COMSIG_MOB_SAY, .proc/handle_speech) @@ -31,6 +32,7 @@ return REMOVE_TRAIT(owner, TRAIT_STUNIMMUNE, TRAIT_HULK) REMOVE_TRAIT(owner, TRAIT_PUSHIMMUNE, TRAIT_HULK) + ADD_TRAIT(owner, TRAIT_CHUNKYFINGERS, TRAIT_HULK) owner.update_body_parts() SEND_SIGNAL(owner, COMSIG_CLEAR_MOOD_EVENT, "hulk") UnregisterSignal(owner, COMSIG_MOB_SAY) diff --git a/code/datums/mutations/speech.dm b/code/datums/mutations/speech.dm index f02b7f185f..82138e6e34 100644 --- a/code/datums/mutations/speech.dm +++ b/code/datums/mutations/speech.dm @@ -95,6 +95,7 @@ message = replacetext(message," ugly "," beautiful ") message = replacetext(message," douchbag "," nice guy ") message = replacetext(message," whore "," lady ") + message = replacetext(message," gamer "," intellectual ") message = replacetext(message," nerd "," smarty pants ") message = replacetext(message," moron "," fun person ") message = replacetext(message," IT'S LOOSE "," EVERYTHING IS FINE ") diff --git a/code/datums/ruins/lavaland.dm b/code/datums/ruins/lavaland.dm index 4f18e6fd62..7ea2d2615d 100644 --- a/code/datums/ruins/lavaland.dm +++ b/code/datums/ruins/lavaland.dm @@ -229,4 +229,13 @@ id = "puzzle" description = "Mystery to be solved." suffix = "lavaland_surface_puzzle.dmm" - cost = 5 \ No newline at end of file + cost = 5 + +/datum/map_template/ruin/lavaland/elite_tumor + name = "Pulsating Tumor" + id = "tumor" + description = "A strange tumor which houses a powerful beast..." + suffix = "lavaland_surface_elite_tumor.dmm" + cost = 5 + always_place = TRUE + allow_duplicates = TRUE diff --git a/code/datums/ruins/station.dm b/code/datums/ruins/station.dm new file mode 100644 index 0000000000..56b3faff89 --- /dev/null +++ b/code/datums/ruins/station.dm @@ -0,0 +1,21 @@ +/datum/map_template/ruin/station + prefix = "_maps/RandomRuins/StationRuins/" + cost = 0 + +// Boxstation + // Engine + +/datum/map_template/ruin/station/box/engine + id = "engine_sm" + suffix = "Box/Engine/engine_sm.dmm" + name = "Engine SM" + +/datum/map_template/ruin/station/box/engine/singulo + id = "engine_singulo" + suffix = "Box/Engine/engine_singulo.dmm" + name = "Engine Singulo" + +/datum/map_template/ruin/station/box/engine/tesla + id = "engine_tesla" + suffix = "Box/Engine/engine_tesla.dmm" + name = "Engine Tesla" \ No newline at end of file diff --git a/code/datums/status_effects/debuffs.dm b/code/datums/status_effects/debuffs.dm index ac2d2f37ab..f5f012e7f9 100644 --- a/code/datums/status_effects/debuffs.dm +++ b/code/datums/status_effects/debuffs.dm @@ -80,34 +80,55 @@ desc = "You've fallen asleep. Wait a bit and you should wake up. Unless you don't, considering how helpless you are." icon_state = "asleep" -//TASER -/datum/status_effect/electrode - id = "tased" +/datum/status_effect/no_combat_mode/ + id = "no_combat_mode" blocks_combatmode = TRUE - status_type = STATUS_EFFECT_REPLACE alert_type = null + status_type = STATUS_EFFECT_REPLACE -/datum/status_effect/electrode/on_creation(mob/living/new_owner, set_duration) +/datum/status_effect/no_combat_mode/on_creation(mob/living/new_owner, set_duration) if(isnum(set_duration)) duration = set_duration . = ..() + if(iscarbon(owner)) + var/mob/living/carbon/C = owner + if(C.combatmode) + C.toggle_combat_mode(TRUE) + +/datum/status_effect/no_combat_mode/mesmerize + id = "Mesmerize" + alert_type = /obj/screen/alert/status_effect/mesmerized + +/obj/screen/alert/status_effect/mesmerized + name = "Mesmerized" + desc = "You cant tear your sight from who is in front of you...Their gaze is simply too enthralling.." + icon = 'icons/mob/actions/bloodsucker.dmi' + icon_state = "power_mez" + +/datum/status_effect/no_combat_mode/electrode + id = "tased" + +/datum/status_effect/no_combat_mode/electrode/on_creation(mob/living/new_owner, set_duration) + if(isnum(set_duration)) //TODO, figure out how to grab from subtype + duration = set_duration + . = ..() if(iscarbon(owner)) var/mob/living/carbon/C = owner if(C.combatmode) C.toggle_combat_mode(TRUE) C.add_movespeed_modifier(MOVESPEED_ID_TASED_STATUS, TRUE, override = TRUE, multiplicative_slowdown = 8) -/datum/status_effect/electrode/on_remove() +/datum/status_effect/no_combat_mode/electrode/on_remove() if(iscarbon(owner)) var/mob/living/carbon/C = owner C.remove_movespeed_modifier(MOVESPEED_ID_TASED_STATUS) . = ..() -/datum/status_effect/electrode/tick() +/datum/status_effect/no_combat_mode/electrode/tick() if(owner) owner.adjustStaminaLoss(5) //if you really want to try to stamcrit someone with a taser alone, you can, but it'll take time and good timing. -/datum/status_effect/electrode/nextmove_modifier() //why is this a proc. its no big deal since this doesnt get called often at all but literally w h y +/datum/status_effect/no_combat_mode/electrode/nextmove_modifier() //why is this a proc. its no big deal since this doesnt get called often at all but literally w h y return 2 //OTHER DEBUFFS @@ -388,6 +409,19 @@ else new /obj/effect/temp_visual/bleed(get_turf(owner)) +/datum/status_effect/neck_slice + id = "neck_slice" + status_type = STATUS_EFFECT_UNIQUE + alert_type = null + duration = -1 + +/datum/status_effect/neck_slice/tick() + var/mob/living/carbon/human/H = owner + if(H.stat == DEAD || H.bleed_rate <= 8) + H.remove_status_effect(/datum/status_effect/neck_slice) + if(prob(10)) + H.emote(pick("gasp", "gag", "choke")) + /mob/living/proc/apply_necropolis_curse(set_curse, duration = 10 MINUTES) var/datum/status_effect/necropolis_curse/C = has_status_effect(STATUS_EFFECT_NECROPOLIS_CURSE) if(!set_curse) @@ -481,7 +515,7 @@ deltimer(timerid) -//Kindle: Used by servants of Ratvar. 10-second knockdown, reduced by 1 second per 5 damage taken while the effect is active. +//Kindle: Used by servants of Ratvar. 10-second knockdown, reduced by 1 second per 5 damage taken while the effect is active. Does not take into account Oxy-damage /datum/status_effect/kindle id = "kindle" status_type = STATUS_EFFECT_UNIQUE @@ -489,6 +523,7 @@ duration = 100 alert_type = /obj/screen/alert/status_effect/kindle var/old_health + var/old_oxyloss /datum/status_effect/kindle/tick() owner.Knockdown(15, TRUE, FALSE, 15) @@ -498,7 +533,9 @@ C.stuttering = max(5, C.stuttering) if(!old_health) old_health = owner.health - var/health_difference = old_health - owner.health + if(!old_oxyloss) + old_oxyloss = owner.getOxyLoss() + var/health_difference = old_health - owner.health - CLAMP(owner.getOxyLoss() - old_oxyloss,0, owner.getOxyLoss()) if(!health_difference) return owner.visible_message("The light in [owner]'s eyes dims as [owner.p_theyre()] harmed!", \ @@ -506,6 +543,7 @@ health_difference *= 2 //so 10 health difference translates to 20 deciseconds of stun reduction duration -= health_difference old_health = owner.health + old_oxyloss = owner.getOxyLoss() /datum/status_effect/kindle/on_remove() owner.visible_message("The light in [owner]'s eyes fades!", \ @@ -698,4 +736,4 @@ datum/status_effect/pacify if(LAZYLEN(targets) && I) to_chat(owner, "Your arm spasms!") owner.log_message("threw [I] due to a Muscle Spasm", LOG_ATTACK) - owner.throw_item(pick(targets)) \ No newline at end of file + owner.throw_item(pick(targets)) diff --git a/code/datums/traits/good.dm b/code/datums/traits/good.dm index 80a5f24250..b74f24c469 100644 --- a/code/datums/traits/good.dm +++ b/code/datums/traits/good.dm @@ -8,12 +8,14 @@ mob_trait = TRAIT_ALCOHOL_TOLERANCE gain_text = "You feel like you could drink a whole keg!" lose_text = "You don't feel as resistant to alcohol anymore. Somehow." + medical_record_text = "Patient demonstrates a high tolerance for alcohol." /datum/quirk/apathetic name = "Apathetic" desc = "You just don't care as much as other people. That's nice to have in a place like this, I guess." value = 1 mood_quirk = TRUE + medical_record_text = "Patient was administered the Apathy Evaluation Scale but did not bother to complete it." /datum/quirk/apathetic/add() var/datum/component/mood/mood = quirk_holder.GetComponent(/datum/component/mood) @@ -42,6 +44,7 @@ mob_trait = TRAIT_EMPATH gain_text = "You feel in tune with those around you." lose_text = "You feel isolated from others." + medical_record_text = "Patient is highly perceptive of and sensitive to social cues, or may possibly have ESP. Further testing needed." /datum/quirk/freerunning name = "Freerunning" @@ -50,6 +53,7 @@ mob_trait = TRAIT_FREERUNNING gain_text = "You feel lithe on your feet!" lose_text = "You feel clumsy again." + medical_record_text = "Patient scored highly on cardio tests." /datum/quirk/friendly name = "Friendly" @@ -59,6 +63,7 @@ gain_text = "You want to hug someone." lose_text = "You no longer feel compelled to hug others." mood_quirk = TRUE + medical_record_text = "Patient demonstrates low-inhibitions for physical contact and well-developed arms. Requesting another doctor take over this case." /datum/quirk/jolly name = "Jolly" @@ -66,6 +71,11 @@ value = 1 mob_trait = TRAIT_JOLLY mood_quirk = TRUE + medical_record_text = "Patient demonstrates constant euthymia irregular for environment. It's a bit much, to be honest." + +/datum/quirk/jolly/on_process() + if(prob(0.05)) + SEND_SIGNAL(quirk_holder, COMSIG_ADD_MOOD_EVENT, "jolly", /datum/mood_event/jolly) /datum/quirk/light_step name = "Light Step" @@ -74,6 +84,7 @@ mob_trait = TRAIT_LIGHT_STEP gain_text = "You walk with a little more litheness." lose_text = "You start tromping around like a barbarian." + medical_record_text = "Patient's dexterity belies a strong capacity for stealth." /datum/quirk/quick_step name = "Quick Step" @@ -82,6 +93,7 @@ mob_trait = TRAIT_SPEEDY_STEP gain_text = "You feel determined. No time to lose." lose_text = "You feel less determined. What's the rush, man?" + medical_record_text = "Patient scored highly on racewalking tests." /datum/quirk/musician name = "Musician" @@ -90,6 +102,7 @@ mob_trait = TRAIT_MUSICIAN gain_text = "You know everything about musical instruments." lose_text = "You forget how musical instruments work." + medical_record_text = "Patient brain scans show a highly-developed auditory pathway." /datum/quirk/musician/on_spawn() var/mob/living/carbon/human/H = quirk_holder @@ -101,21 +114,6 @@ H.equip_to_slot(musicaltuner, SLOT_IN_BACKPACK) H.regenerate_icons() -/datum/quirk/night_vision - name = "Night Vision" - desc = "You can see slightly more clearly in full darkness than most people." - value = 1 - mob_trait = TRAIT_NIGHT_VISION - gain_text = "The shadows seem a little less dark." - lose_text = "Everything seems a little darker." - -/datum/quirk/night_vision/on_spawn() - var/mob/living/carbon/human/H = quirk_holder - var/obj/item/organ/eyes/eyes = H.getorgan(/obj/item/organ/eyes) - if(!eyes || eyes.lighting_alpha) - return - eyes.Insert(H) //refresh their eyesight and vision - /datum/quirk/photographer name = "Photographer" desc = "You know how to handle a camera, shortening the delay between each shot." @@ -123,6 +121,7 @@ mob_trait = TRAIT_PHOTOGRAPHER gain_text = "You know everything about photography." lose_text = "You forget how photo cameras work." + medical_record_text = "Patient mentions photography as a stress-relieving hobby." /datum/quirk/photographer/on_spawn() var/mob/living/carbon/human/H = quirk_holder @@ -136,12 +135,14 @@ desc = "You know your body well, and can accurately assess the extent of your wounds." value = 2 mob_trait = TRAIT_SELF_AWARE + medical_record_text = "Patient demonstrates an uncanny knack for self-diagnosis." /datum/quirk/skittish name = "Skittish" desc = "You can conceal yourself in danger. Ctrl-shift-click a closed locker to jump into it, as long as you have access." value = 2 mob_trait = TRAIT_SKITTISH + medical_record_text = "Patient demonstrates a high aversion to danger and has described hiding in containers out of fear." /datum/quirk/spiritual name = "Spiritual" @@ -150,6 +151,7 @@ mob_trait = TRAIT_SPIRITUAL gain_text = "You feel a little more faithful to the gods today." lose_text = "You feel less faithful in the gods." + medical_record_text = "Patient reports a belief in a higher power." /datum/quirk/tagger name = "Tagger" @@ -158,6 +160,7 @@ mob_trait = TRAIT_TAGGER gain_text = "You know how to tag walls efficiently." lose_text = "You forget how to tag walls properly." + medical_record_text = "Patient was recently seen for possible paint huffing incident." /datum/quirk/tagger/on_spawn() var/mob/living/carbon/human/H = quirk_holder @@ -173,6 +176,7 @@ mob_trait = TRAIT_VORACIOUS gain_text = "You feel HONGRY." lose_text = "You no longer feel HONGRY." + medical_record_text = "Patient demonstrates a disturbing capacity for eating." /datum/quirk/trandening name = "High Luminosity Eyes" @@ -194,6 +198,7 @@ mob_trait = TRAIT_HIGH_BLOOD gain_text = "You feel full of blood!" lose_text = "You feel like your blood pressure went down." + medical_record_text = "Patient's blood tests report an abnormal concentration of red blood cells in their bloodstream." /datum/quirk/bloodpressure/add() var/mob/living/M = quirk_holder @@ -203,3 +208,15 @@ /datum/quirk/bloodpressure/remove() var/mob/living/M = quirk_holder M.blood_ratio = 1 + +/datum/quirk/night_vision + name = "Night Vision" + desc = "You can see slightly more clearly in full darkness than most people." + value = 1 + mob_trait = TRAIT_NIGHT_VISION + gain_text = "The shadows seem a little less dark." + lose_text = "Everything seems a little darker." + +/datum/quirk/night_vision/on_spawn() + var/mob/living/carbon/human/H = quirk_holder + H.update_sight() diff --git a/code/datums/traits/negative.dm b/code/datums/traits/negative.dm index 178e1aaeb0..3319259381 100644 --- a/code/datums/traits/negative.dm +++ b/code/datums/traits/negative.dm @@ -22,14 +22,19 @@ value = -1 gain_text = "You start feeling depressed." lose_text = "You no longer feel depressed." //if only it were that easy! - medical_record_text = "Patient has a severe mood disorder causing them to experience sudden moments of sadness." + medical_record_text = "Patient has a severe mood disorder, causing them to experience acute episodes of depression." mood_quirk = TRUE +/datum/quirk/depression/on_process() + if(prob(0.05)) + SEND_SIGNAL(quirk_holder, COMSIG_ADD_MOOD_EVENT, "depression", /datum/mood_event/depression) + /datum/quirk/family_heirloom name = "Family Heirloom" desc = "You are the current owner of an heirloom, passed down for generations. You have to keep it safe!" value = -1 mood_quirk = TRUE + medical_record_text = "Patient demonstrates an unnatural attachment to a family heirloom." var/obj/item/heirloom var/where @@ -143,6 +148,7 @@ name = "Nyctophobia" desc = "As far as you can remember, you've always been afraid of the dark. While in the dark without a light source, you instinctually act careful, and constantly feel a sense of dread." value = -1 + medical_record_text = "Patient demonstrates a fear of the dark. (Seriously?)" /datum/quirk/nyctophobia/on_process() var/mob/living/carbon/human/H = quirk_holder @@ -163,7 +169,8 @@ desc = "Bright lights irritate you. Your eyes start to water, your skin feels itchy against the photon radiation, and your hair gets dry and frizzy. Maybe it's a medical condition. If only Nanotrasen was more considerate of your needs..." value = -1 gain_text = "The safty of light feels off..." - lose_text = "Enlighing." + lose_text = "Enlightening." + medical_record_text = "Despite my warnings, the patient refuses turn on the lights, only to end up rolling down a full flight of stairs and into the cellar." /datum/quirk/lightless/on_process() var/turf/T = get_turf(quirk_holder) @@ -332,16 +339,19 @@ medical_record_text = "Patient has an extreme or irrational fear and aversion to an undefined stimuli." var/datum/brain_trauma/mild/phobia/phobia -/datum/quirk/phobia/add() +/datum/quirk/phobia/post_add() var/mob/living/carbon/human/H = quirk_holder phobia = new - H.gain_trauma(phobia, TRAUMA_RESILIENCE_SURGERY) + H.gain_trauma(phobia, TRAUMA_RESILIENCE_ABSOLUTE) + +/datum/quirk/phobia/remove() + var/mob/living/carbon/human/H = quirk_holder + H?.cure_trauma_type(phobia, TRAUMA_RESILIENCE_ABSOLUTE) /datum/quirk/mute name = "Mute" desc = "Due to some accident, medical condition, or simply by choice, you are completely unable to speak." value = -2 //HALP MAINTS - mob_trait = TRAIT_MUTE gain_text = "You find yourself unable to speak!" lose_text = "You feel a growing strength in your vocal chords." medical_record_text = "Functionally mute, patient is unable to use their voice in any capacity." @@ -350,14 +360,17 @@ /datum/quirk/mute/add() var/mob/living/carbon/human/H = quirk_holder mute = new - H.gain_trauma(mute, TRAUMA_RESILIENCE_SURGERY) + H.gain_trauma(mute, TRAUMA_RESILIENCE_ABSOLUTE) + +/datum/quirk/mute/remove() + var/mob/living/carbon/human/H = quirk_holder + H?.cure_trauma_type(mute, TRAUMA_RESILIENCE_ABSOLUTE) /datum/quirk/mute/on_process() if(quirk_holder.mind && LAZYLEN(quirk_holder.mind.antag_datums)) to_chat(quirk_holder, "Your antagonistic nature has caused your voice to be heard.") qdel(src) - /datum/quirk/unstable name = "Unstable" desc = "Due to past troubles, you are unable to recover your sanity if you lose it. Be very careful managing your mood!" @@ -373,7 +386,7 @@ value = -4 gain_text = "You can't see anything." lose_text = "You miraculously gain back your vision." - medical_record_text = "Subject has permanent blindness." + medical_record_text = "Patient has permanent blindness." /datum/quirk/blindness/add() quirk_holder.become_blind(ROUNDSTART_TRAIT) @@ -384,3 +397,6 @@ if(!H.equip_to_slot_if_possible(glasses, SLOT_GLASSES, bypass_equip_delay_self = TRUE)) //if you can't put it on the user's eyes, put it in their hands, otherwise put it on their eyes eyes H.put_in_hands(glasses) H.regenerate_icons() + +/datum/quirk/blindness/remove() + quirk_holder?.cure_blind(ROUNDSTART_TRAIT) diff --git a/code/datums/traits/neutral.dm b/code/datums/traits/neutral.dm index 9e05af03b6..eae2db6a5f 100644 --- a/code/datums/traits/neutral.dm +++ b/code/datums/traits/neutral.dm @@ -16,6 +16,7 @@ value = 0 gain_text = "You feel an intense craving for pineapple." lose_text = "Your feelings towards pineapples seem to return to a lukewarm state." + medical_record_text = "Patient demonstrates a pathological love of pineapple." /datum/quirk/pineapple_liker/add() var/mob/living/carbon/human/H = quirk_holder @@ -34,6 +35,7 @@ value = 0 gain_text = "You find yourself pondering what kind of idiot actually enjoys pineapples..." lose_text = "Your feelings towards pineapples seem to return to a lukewarm state." + medical_record_text = "Patient is correct to think that pineapple is disgusting." /datum/quirk/pineapple_hater/add() var/mob/living/carbon/human/H = quirk_holder @@ -52,6 +54,7 @@ value = 0 gain_text = "You start craving something that tastes strange." lose_text = "You feel like eating normal food again." + medical_record_text = "Patient demonstrates irregular nutrition preferences." /datum/quirk/deviant_tastes/add() var/mob/living/carbon/human/H = quirk_holder @@ -92,7 +95,7 @@ value = 0 gain_text = "You feel more prudish." lose_text = "You don't feel as prudish as before." - medical_record_text = "Patient exhibits a special gene that makes them immune to Crocin and Hexacrocin." + medical_record_text = "Patient exhibits a special gene that makes them immune to aphrodisiacs." /datum/quirk/libido name = "Nymphomania" @@ -134,6 +137,7 @@ value = 0 mob_trait = TRAIT_PHARMA lose_text = "Your liver feels different." + medical_record_text = "Non-invasive tests report that the patient's metabolism is indeed incompatible with a certain \"stimulants\"." var/active = FALSE var/power = 0 var/cachedmoveCalc = 1 diff --git a/code/datums/weather/weather_types/radiation_storm.dm b/code/datums/weather/weather_types/radiation_storm.dm index 6765cdf2cd..0d763aa5ad 100644 --- a/code/datums/weather/weather_types/radiation_storm.dm +++ b/code/datums/weather/weather_types/radiation_storm.dm @@ -22,27 +22,17 @@ target_trait = ZTRAIT_STATION immunity_type = "rad" + + var/radiation_intensity = 100 /datum/weather/rad_storm/telegraph() ..() status_alarm(TRUE) - /datum/weather/rad_storm/weather_act(mob/living/L) var/resist = L.getarmor(null, "rad") - if(prob(40)) - if(ishuman(L)) - var/mob/living/carbon/human/H = L - if(H.dna && !HAS_TRAIT(H, TRAIT_RADIMMUNE)) - if(prob(max(0,100-resist))) - H.randmuti() - if(prob(50)) - if(prob(90)) - H.randmutb() - else - H.randmutg() - H.domutcheck() - L.rad_act(20) + var/ratio = 1 - (min(resist, 100) / 100) + L.rad_act(radiation_intensity * ratio) /datum/weather/rad_storm/end() if(..()) diff --git a/code/game/area/areas.dm b/code/game/area/areas.dm index 612c3cba42..f5e285a5c2 100644 --- a/code/game/area/areas.dm +++ b/code/game/area/areas.dm @@ -327,7 +327,7 @@ GLOBAL_LIST_EMPTY(teleportlocs) for(var/obj/machinery/light/L in src) L.update() -/area/proc/updateicon() +/area/proc/update_icon() var/weather_icon for(var/V in SSweather.processing) var/datum/weather/W = V @@ -337,7 +337,7 @@ GLOBAL_LIST_EMPTY(teleportlocs) if(!weather_icon) icon_state = null -/area/space/updateicon() +/area/space/update_icon() icon_state = null /* @@ -370,7 +370,7 @@ GLOBAL_LIST_EMPTY(teleportlocs) /area/proc/power_change() for(var/obj/machinery/M in src) // for each machine in the area M.power_change() // reverify power status (to update icons etc.) - updateicon() + update_icon() /area/proc/usage(chan) var/used = 0 diff --git a/code/game/atoms.dm b/code/game/atoms.dm index 2fe5380490..7de5707032 100644 --- a/code/game/atoms.dm +++ b/code/game/atoms.dm @@ -809,8 +809,7 @@ Proc for attack log creation, because really why not // Filter stuff /atom/movable/proc/add_filter(name,priority,list/params) - if(!filter_data) - filter_data = list() + LAZYINITLIST(filter_data) var/list/p = params.Copy() p["priority"] = priority filter_data[name] = p @@ -818,7 +817,7 @@ Proc for attack log creation, because really why not /atom/movable/proc/update_filters() filters = null - sortTim(filter_data,associative = TRUE) + filter_data = sortTim(filter_data, /proc/cmp_filter_data_priority, TRUE) for(var/f in filter_data) var/list/data = filter_data[f] var/list/arguments = data.Copy() diff --git a/code/game/gamemodes/bloodsucker/bloodsucker.dm b/code/game/gamemodes/bloodsucker/bloodsucker.dm new file mode 100644 index 0000000000..e784fd836d --- /dev/null +++ b/code/game/gamemodes/bloodsucker/bloodsucker.dm @@ -0,0 +1,292 @@ + +/datum/game_mode + var/list/datum/mind/bloodsuckers = list() // List of minds belonging to this game mode. + var/list/datum/mind/vassals = list() // List of minds that have been turned into Vassals. + //var/list/datum/mind/vamphunters = list() // List of minds hunting vampires. Disabled at the moment + var/obj/effect/sunlight/bloodsucker_sunlight // Sunlight Timer. Created on first Bloodsucker assign. Destroyed on last removed Bloodsucker. + + // LISTS // + var/list/vassal_allowed_antags = list(/datum/antagonist/brother, /datum/antagonist/traitor, /datum/antagonist/traitor/internal_affairs, /datum/antagonist/survivalist, \ + /datum/antagonist/rev, /datum/antagonist/nukeop, /datum/antagonist/pirate, /datum/antagonist/cult, /datum/antagonist/abductee) + // The antags you're allowed to be if turning Vassal. + +/datum/game_mode/bloodsucker + name = "bloodsucker" + config_tag = "bloodsucker" + traitor_name = "Bloodsucker" + antag_flag = ROLE_BLOODSUCKER + false_report_weight = 1 + restricted_jobs = list("AI","Cyborg") + protected_jobs = list("Security Officer", "Warden", "Detective", "Head of Security", "Captain", "Head of Personnel", "Chief Engineer", "Chief Medical Officer", "Research Director", "Quartermaster") + required_players = 20 + required_enemies = 2 + recommended_enemies = 4 + reroll_friendly = FALSE + enemy_minimum_age = 7 + round_ends_with_antag_death = FALSE + + + announce_span = "danger" + announce_text = "Filthy, bloodsucking vampires are crawling around disguised as crewmembers!\n\ + Bloodsuckers: The crew are cattle, while you are both shepherd and slaughterhouse.\n\ + Crew: Put an end to the undead infestation before the station is overcome!" + +/datum/game_mode/bloodsucker/generate_report() + return "Reports indicate that some of your crew may have toppled statues in the past week, angering the gods and becoming cursed with undeath and a desire for blood. Watch out for crewmembers that seem to shun the light or are found pale and delirious." + +// Seems to be run by game ONCE, and finds all potential players to be antag. +/datum/game_mode/bloodsucker/pre_setup() + + // Set Restricted Jobs + if(CONFIG_GET(flag/protect_roles_from_antagonist)) + restricted_jobs += protected_jobs + + if(CONFIG_GET(flag/protect_assistant_from_antagonist)) + restricted_jobs += "Assistant" + + // Set number of Vamps + recommended_enemies = CLAMP(round(num_players()/10), 1, 6); + + // Select Antags + for(var/i = 0, i < recommended_enemies, i++) + if (!antag_candidates.len) + break + var/datum/mind/bloodsucker = pick(antag_candidates) + // Can we even BE a bloodsucker? + //if (can_make_bloodsucker(bloodsucker, display_warning=FALSE)) + bloodsuckers += bloodsucker + bloodsucker.restricted_roles = restricted_jobs + log_game("[bloodsucker.key] (ckey) has been selected as a Bloodsucker.") + antag_candidates.Remove(bloodsucker) // Apparently you can also write antag_candidates -= bloodsucker + + // Assign Hunters (as many as monsters, plus one) + //assign_monster_hunters(bloodsuckers.len, TRUE, bloodsuckers) // Disabled for now + + // Do we have enough vamps to continue? + return bloodsuckers.len >= required_enemies + + +// Gamemode is all done being set up. We have all our Vamps. We now pick objectives and let them know what's happening. +/datum/game_mode/bloodsucker/post_setup() + + // Sunlight (Creating Bloodsuckers manually will check to create this, too) + check_start_sunlight() + + // Vamps + for(var/datum/mind/bloodsucker in bloodsuckers) + // spawn() --> Run block of code but game continues on past it. + // sleep() --> Run block of code and freeze code there (including whoever called us) until it's resolved. + + //Clean Bloodsucker Species (racist?) + //clean_invalid_species(bloodsucker) + // TO-DO !!! + + // Add Bloodsucker Antag Datum (or remove from list on Fail) + if (!make_bloodsucker(bloodsucker)) + bloodsuckers -= bloodsucker + + // NOTE: Hunters are done in ..() parent proc + + return ..() + +// Checking for ACTUALLY Dead Vamps +/datum/game_mode/bloodsucker/are_special_antags_dead() + // Bloodsucker not Final Dead + for(var/datum/mind/bloodsucker in bloodsuckers) + if(!bloodsucker.AmFinalDeath()) + return FALSE + return TRUE + + +// Init Sunlight (called from datum_bloodsucker.on_gain(), in case game mode isn't even Bloodsucker +/datum/game_mode/proc/check_start_sunlight() + // Already Sunlight (and not about to cancel) + if (istype(bloodsucker_sunlight) && !bloodsucker_sunlight.cancel_me) + return + bloodsucker_sunlight = new () + +// End Sun (last bloodsucker removed) +/datum/game_mode/proc/check_cancel_sunlight() + // No Sunlight + if (!istype(bloodsucker_sunlight)) + return + if (bloodsuckers.len <= 0) + bloodsucker_sunlight.cancel_me = TRUE + qdel(bloodsucker_sunlight) + bloodsucker_sunlight = null + +/datum/game_mode/proc/is_daylight() + return istype(bloodsucker_sunlight) && bloodsucker_sunlight.amDay + +////////////////////////////////////////////////////////////////////////////// + + +/datum/game_mode/proc/can_make_bloodsucker(datum/mind/bloodsucker, datum/mind/creator, display_warning=TRUE) // Creator is just here so we can display fail messages to whoever is turning us. + // No Mind + if(!bloodsucker || !bloodsucker.key) // KEY is client login? + //if(creator) // REMOVED. You wouldn't see their name if there is no mind, so why say anything? + // to_chat(creator, "[bloodsucker] isn't self-aware enough to be raised as a Bloodsucker!") + return FALSE + // Current body is invalid + if(!ishuman(bloodsucker.current))// && !ismonkey(bloodsucker.current)) + if(display_warning && creator) + to_chat(creator, "[bloodsucker] isn't evolved enough to be raised as a Bloodsucker!") + return FALSE + // Species Must have a HEART (Sorry Plasmabois) + var/mob/living/carbon/human/H = bloodsucker.current + if(NOBLOOD in H.dna.species.species_traits) + if(display_warning && creator) + to_chat(creator, "[bloodsucker]'s DNA isn't compatible!") + return FALSE + // Already a Non-Human Antag + if(bloodsucker.has_antag_datum(/datum/antagonist/abductor) || bloodsucker.has_antag_datum(/datum/antagonist/devil) || bloodsucker.has_antag_datum(/datum/antagonist/changeling)) + return FALSE + // Already a vamp + if(bloodsucker.has_antag_datum(ANTAG_DATUM_BLOODSUCKER)) + if(display_warning && creator) + to_chat(creator, "[bloodsucker] is already a Bloodsucker!") + return FALSE + // Not High Enough + if(creator) + var/datum/antagonist/bloodsucker/creator_bloodsucker = creator.has_antag_datum(ANTAG_DATUM_BLOODSUCKER) + if(!istype(creator_bloodsucker) || creator_bloodsucker.vamplevel < BLOODSUCKER_LEVEL_TO_EMBRACE) + to_chat(creator, "Your blood is too thin to turn this corpse!") + return FALSE + return TRUE + + +/datum/game_mode/proc/make_bloodsucker(datum/mind/bloodsucker, datum/mind/creator = null) // NOTE: This is a game_mode/proc, NOT a game_mode/bloodsucker/proc! We need to access this function despite the game mode. + if (!can_make_bloodsucker(bloodsucker)) + return FALSE + + // Create Datum: Fledgling + var/datum/antagonist/bloodsucker/A + + // [FLEDGLING] + if (creator) + A = new (bloodsucker) + A.creator = creator + bloodsucker.add_antag_datum(A) + // Log + message_admins("[bloodsucker] has become a Bloodsucker, and was created by [creator].") + log_admin("[bloodsucker] has become a Bloodsucker, and was created by [creator].") + + // [MASTER] + else + A = bloodsucker.add_antag_datum(ANTAG_DATUM_BLOODSUCKER) + + + return TRUE + + +/datum/game_mode/proc/remove_bloodsucker(datum/mind/bloodsucker) + bloodsucker.remove_antag_datum(ANTAG_DATUM_BLOODSUCKER) + + +/datum/game_mode/proc/clean_invalid_species(datum/mind/bloodsucker) + // Only checking for Humans here + if (!ishuman(bloodsucker.current) || !bloodsucker.current.client) + return + var/am_valid = TRUE + var/mob/living/carbon/human/H = bloodsucker.current + + // Check if PLASMAMAN? + if(NOBLOOD in H.dna.species.species_traits) + am_valid = FALSE + + // PROBLEM: + // + // Setting species leaves clothes on. If you were a plasmaman, we need to reassign your entire outfit. Otherwise + // everyone will wonder why you're a human with Plasma clothes (jk they'll know you're antag) + + // Convert to HUMAN (along with ID and PDA) + if (!am_valid) + H.set_species(/datum/species/human) + H.real_name = H.client.prefs.custom_names["human"] + var/obj/item/card/id/ID = H.wear_id?.GetID() + if(ID) + ID.registered_name = H.real_name + ID.update_label() + + +/datum/game_mode/proc/can_make_vassal(mob/living/target, datum/mind/creator, display_warning=TRUE)//, check_antag_or_loyal=FALSE) + // Not Correct Type: Abort + if (!iscarbon(target) || !creator) + return FALSE + if (target.stat > UNCONSCIOUS) + return FALSE + // Check Overdose: Am I even addicted to blood? Do I even have any in me? + //if (!target.reagents.addiction_list || !target.reagents.reagent_list) + //message_admins("DEBUG2: can_make_vassal() Abort: No reagents") + // return 0 + // Check Overdose: Did my current volume go over the Overdose threshold? + //var/am_addicted = 0 + //for (var/datum/reagent/blood/vampblood/blood in target.reagents.addiction_list) // overdosed is tracked in reagent_list, not addiction_list. + //message_admins("DEBUG3: can_make_vassal() Found Blood! [blood] [blood.overdose]") + //if (blood.overdosed) + // am_addicted = 1 // Blood is present in addiction? That's all we need. + // break + + //if (!am_addicted) + //message_admins("DEBUG4: can_make_vassal() Abort: No Blood") + // return 0 + // No Mind! + if (!target.mind || !target.mind.key) + if (display_warning) + to_chat(creator, "[target] isn't self-aware enough to be made into a Vassal.") + return FALSE + // Already MY Vassal + var/datum/antagonist/vassal/V = target.mind.has_antag_datum(ANTAG_DATUM_VASSAL) + if (istype(V) && V.master) + if (V.master.owner == creator) + if (display_warning) + to_chat(creator, "[target] is already your loyal Vassal!") + else + if (display_warning) + to_chat(creator, "[target] is the loyal Vassal of another Bloodsucker!") + return FALSE + // Already Antag or Loyal (Vamp Hunters count as antags) + if (target.mind.enslaved_to || AmInvalidAntag(target.mind)) //!VassalCheckAntagValid(target.mind, check_antag_or_loyal)) // HAS_TRAIT(target, TRAIT_MINDSHIELD, "implant") || + if (display_warning) + to_chat(creator, "[target] resists the power of your blood to dominate their mind!") + return FALSE + return TRUE + + +/datum/game_mode/proc/AmValidAntag(datum/mind/M) + // No List? + if(!islist(M.antag_datums) || M.antag_datums.len == 0) + return FALSE + // Am I NOT an invalid Antag? NOTE: We already excluded non-antags above. Don't worry about the "No List?" check in AmInvalidIntag() + return !AmInvalidAntag(M) + +/datum/game_mode/proc/AmInvalidAntag(datum/mind/M) + // No List? + if(!islist(M.antag_datums) || M.antag_datums.len == 0) + return FALSE + // Does even ONE antag appear in this mind that isn't in the list? Then FAIL! + for(var/datum/antagonist/antag_datum in M.antag_datums) + if (!(antag_datum.type in vassal_allowed_antags)) // vassal_allowed_antags is a list stored in the game mode, above. + //message_admins("DEBUG VASSAL: Found Invalid: [antag_datum] // [antag_datum.type]") + return TRUE + //message_admins("DEBUG VASSAL: Valid Antags! (total of [M.antag_datums.len])") + // WHEN YOU DELETE THE ABOVE: Remove the 3 second timer on converting the vassal too. + return FALSE + +/datum/game_mode/proc/make_vassal(mob/living/target, datum/mind/creator) + if (!can_make_vassal(target,creator)) + return FALSE + // Make Vassal + var/datum/antagonist/vassal/V = new (target.mind) + var/datum/antagonist/bloodsucker/B = creator.has_antag_datum(ANTAG_DATUM_BLOODSUCKER) + V.master = B + target.mind.add_antag_datum(V, V.master.get_team()) + // Update Bloodsucker Title (we're a daddy now) + B.SelectTitle(am_fledgling = FALSE) // Only works if you have no title yet. + // Log + message_admins("[target] has become a Vassal, and is enslaved to [creator].") + log_admin("[target] has become a Vassal, and is enslaved to [creator].") + return TRUE + +/datum/game_mode/proc/remove_vassal(datum/mind/vassal) + vassal.remove_antag_datum(ANTAG_DATUM_VASSAL) diff --git a/code/game/gamemodes/bloodsucker/hunter.dm b/code/game/gamemodes/bloodsucker/hunter.dm new file mode 100644 index 0000000000..cec990e9c3 --- /dev/null +++ b/code/game/gamemodes/bloodsucker/hunter.dm @@ -0,0 +1,50 @@ + + +/* +// Called from game mode pre_setup() +/datum/game_mode/proc/assign_monster_hunters(monster_count = 4, guaranteed_hunters = FALSE, list/datum/mind/exclude_from_hunter) + + // Not all game modes GUARANTEE a hunter + if (rand(0,2) == 0) // 50% of the time, we get fewer or NO Hunters + if (!guaranteed_hunters) + return + else + monster_count /= 2 + + var/list/no_hunter_jobs = list("AI","Cyborg") + + // Set Restricted Jobs + if(CONFIG_GET(flag/protect_roles_from_antagonist)) + no_hunter_jobs += list("Security Officer", "Warden", "Detective", "Head of Security", "Captain", "Head of Personnel", "Chief Engineer", "Chief Medical Officer", "Research Director", "Quartermaster") + + if(CONFIG_GET(flag/protect_assistant_from_antagonist)) + no_hunter_jobs += "Assistant" + + // Find Valid Hunters + var/list/datum/mind/hunter_candidates = get_players_for_role(ROLE_MONSTERHUNTER) + + // Assign Hunters (as many as vamps, plus one) + for(var/i = 1, i < monster_count, i++) // Start at 1 so we skip Hunters if there's only one sucker. + if (!hunter_candidates.len) + break + // Assign Hunter + var/datum/mind/hunter = pick(hunter_candidates) + hunter_candidates.Remove(hunter) // Remove Either Way + // Already Antag? Skip + if (islist(exclude_from_hunter) && (locate(hunter) in exclude_from_hunter)) //if (islist(hunter.antag_datums) && hunter.antag_datums.len) + i -- + continue + // NOTE: + vamphunters += hunter + hunter.restricted_roles = no_hunter_jobs + log_game("[hunter.key] (ckey) has been selected as a Hunter.") + +// Called from game mode post_setup() +/datum/game_mode/proc/finalize_monster_hunters(monster_count = 4) + var/amEvil = TRUE // First hunter is always an evil boi + for(var/datum/mind/hunter in vamphunters) + var/datum/antagonist/vamphunter/A = new (hunter) + A.bad_dude = amEvil + hunter.add_antag_datum(A) + amEvil = FALSE // Every other hunter is just a boring greytider +*/ diff --git a/code/game/gamemodes/clown_ops/clown_weapons.dm b/code/game/gamemodes/clown_ops/clown_weapons.dm index ee96d1fa10..9b52ddda1e 100644 --- a/code/game/gamemodes/clown_ops/clown_weapons.dm +++ b/code/game/gamemodes/clown_ops/clown_weapons.dm @@ -265,6 +265,7 @@ armor = list("melee" = 40, "bullet" = 40, "laser" = 50, "energy" = 35, "bomb" = 20, "bio" = 0, "rad" = 0, "fire" = 100, "acid" = 100) max_temperature = 35000 operation_req_access = list(ACCESS_SYNDICATE) + internals_req_access = list(ACCESS_SYNDICATE) wreckage = /obj/structure/mecha_wreckage/honker/dark max_equip = 3 spawn_tracked = FALSE diff --git a/code/game/gamemodes/dynamic/dynamic.dm b/code/game/gamemodes/dynamic/dynamic.dm index cd9500284b..075184046d 100644 --- a/code/game/gamemodes/dynamic/dynamic.dm +++ b/code/game/gamemodes/dynamic/dynamic.dm @@ -236,6 +236,9 @@ GLOBAL_VAR_INIT(dynamic_forced_threat_level, -1) return rule.round_result() return ..() +/datum/game_mode/dynamic/generate_report() + return "Mysterious signals that demonstrate strange dynamics have been detected in your sector. Watch out for oddities." + /datum/game_mode/dynamic/send_intercept() . = "Central Command Status Summary
" switch(round(threat_level)) @@ -297,6 +300,7 @@ GLOBAL_VAR_INIT(dynamic_forced_threat_level, -1) /datum/game_mode/dynamic/proc/log_threat(var/log_str,var/verbose = FALSE) threat_log_verbose += ("[worldtime2text()]: "+log_str) + SSblackbox.record_feedback("tally","dynamic_threat_log",1,log_str) if(!verbose) threat_log += log_str @@ -326,6 +330,10 @@ GLOBAL_VAR_INIT(dynamic_forced_threat_level, -1) peaceful_percentage = round(LORENTZ_CUMULATIVE_DISTRIBUTION(relative_threat, GLOB.dynamic_curve_centre, GLOB.dynamic_curve_width), 0.01)*100 threat = threat_level + SSblackbox.record_feedback("tally","dynamic_threat",threat_level,"Initial threat level") + SSblackbox.record_feedback("tally","dynamic_threat",GLOB.dynamic_curve_centre,"Curve centre") + SSblackbox.record_feedback("tally","dynamic_threat",GLOB.dynamic_curve_width,"Curve width") + SSblackbox.record_feedback("tally","dynamic_threat",peaceful_percentage,"Percent of same-vote rounds that are more peaceful") /datum/game_mode/dynamic/can_start() message_admins("Dynamic mode parameters for the round:") @@ -337,6 +345,7 @@ GLOBAL_VAR_INIT(dynamic_forced_threat_level, -1) if(GLOB.dynamic_forced_threat_level >= 0) threat_level = round(GLOB.dynamic_forced_threat_level, 0.1) threat = threat_level + SSblackbox.record_feedback("tally","dynamic_threat",threat_level,"Threat level (forced by admins)") else generate_threat() @@ -381,7 +390,8 @@ GLOBAL_VAR_INIT(dynamic_forced_threat_level, -1) if (roundstart_rules.len <= 0) log_game("DYNAMIC: [roundstart_rules.len] rules.") return TRUE - + SSblackbox.record_feedback("tally","dynamic",roundstart_rules.len,"Roundstart rules considered") + SSblackbox.record_feedback("tally","dynamic",roundstart_rules.len,"Players readied up") if(GLOB.dynamic_forced_roundstart_ruleset.len > 0) rigged_roundstart() else @@ -534,6 +544,7 @@ GLOBAL_VAR_INIT(dynamic_forced_threat_level, -1) if(rule.execute()) if(rule.persistent) current_rules += rule + SSblackbox.record_feedback("associative","dynamic_rulesets",1,rule.get_blackbox_info()) return TRUE rule.clean_up() // Refund threat, delete teams and so on. executed_rules -= rule @@ -612,6 +623,7 @@ GLOBAL_VAR_INIT(dynamic_forced_threat_level, -1) else if(new_rule.flags & ONLY_RULESET) only_ruleset_executed = TRUE log_game("DYNAMIC: Making a call to a specific ruleset...[new_rule.name]!") + SSblackbox.record_feedback("associative","dynamic_rulesets",1,new_rule.get_blackbox_info()) executed_rules += new_rule if (new_rule.persistent) current_rules += new_rule @@ -636,6 +648,7 @@ GLOBAL_VAR_INIT(dynamic_forced_threat_level, -1) message_admins("[key_name(M)] joined the station, and was selected by the [rule.name] ruleset.") log_game("DYNAMIC: [key_name(M)] joined the station, and was selected by the [rule.name] ruleset.") executed_rules += rule + SSblackbox.record_feedback("associative","dynamic_rulesets",1,rule.get_blackbox_info()) rule.candidates.Cut() if (rule.persistent) current_rules += rule @@ -652,6 +665,8 @@ GLOBAL_VAR_INIT(dynamic_forced_threat_level, -1) for (var/datum/dynamic_ruleset/rule in current_rules) if(rule.rule_process() == RULESET_STOP_PROCESSING) // If rule_process() returns 1 (RULESET_STOP_PROCESSING), stop processing. current_rules -= rule + SSblackbox.record_feedback("tally","dynamic",1,"Rulesets finished") + SSblackbox.record_feedback("associative","dynamic_rulesets_finished",1,rule.get_blackbox_info()) if (midround_injection_cooldown < world.time) if (GLOB.dynamic_forced_extended) @@ -670,6 +685,7 @@ GLOBAL_VAR_INIT(dynamic_forced_threat_level, -1) update_playercounts() if (get_injection_chance()) + SSblackbox.record_feedback("tally","dynamic",1,"Attempted midround injections") var/cur_threat_frac = threat/threat_level var/list/drafted_rules = list() var/antag_num = current_players[CURRENT_LIVING_ANTAGS].len @@ -685,12 +701,16 @@ GLOBAL_VAR_INIT(dynamic_forced_threat_level, -1) drafted_rules[rule] = round(rule.get_weight() + (rule.cost * cur_threat_frac)) else drafted_rules[rule] = rule.get_weight() + else if(threat < rule.cost) + SSblackbox.record_feedback("tally","dynamic",1,"Times rulesets rejected due to not enough threat to spend") if (drafted_rules.len > 0) + SSblackbox.record_feedback("tally","dynamic",1,"Successful midround injections") picking_midround_latejoin_rule(drafted_rules) else midround_injection_cooldown = (midround_injection_cooldown + world.time)/2 if(event_injection_cooldown < world.time) + SSblackbox.record_feedback("tally","dynamic",1,"Attempted event injections") var/event_injection_cooldown_middle = 0.5*(GLOB.dynamic_event_delay_max + GLOB.dynamic_event_delay_min) event_injection_cooldown = (round(CLAMP(EXP_DISTRIBUTION(event_injection_cooldown_middle), GLOB.dynamic_event_delay_min, GLOB.dynamic_event_delay_max)) + world.time) message_admins("DYNAMIC: Doing event injection.") @@ -701,7 +721,10 @@ GLOBAL_VAR_INIT(dynamic_forced_threat_level, -1) if(rule.acceptable(current_players[CURRENT_LIVING_PLAYERS].len, threat_level) && threat >= rule.cost) if(rule.ready()) drafted_rules[rule] = rule.get_weight() + else if(threat < rule.cost) + SSblackbox.record_feedback("tally","dynamic",1,"Times rulesets rejected due to not enough threat to spend") if(drafted_rules.len > 0) + SSblackbox.record_feedback("tally","dynamic",1,"Successful event injections") picking_midround_latejoin_rule(drafted_rules) /// Updates current_players. @@ -792,6 +815,7 @@ GLOBAL_VAR_INIT(dynamic_forced_threat_level, -1) forced_latejoin_rule = null else if (latejoin_injection_cooldown < world.time && prob(get_injection_chance())) + SSblackbox.record_feedback("tally","dynamic",1,"Attempted latejoin injections") var/list/drafted_rules = list() for (var/datum/dynamic_ruleset/latejoin/rule in latejoin_rules) if (rule.acceptable(current_players[CURRENT_LIVING_PLAYERS].len, threat_level) && threat >= rule.cost) @@ -809,12 +833,14 @@ GLOBAL_VAR_INIT(dynamic_forced_threat_level, -1) drafted_rules[rule] = rule.get_weight() if (drafted_rules.len > 0 && picking_midround_latejoin_rule(drafted_rules)) + SSblackbox.record_feedback("tally","dynamic",1,"Successful latejoin injections") var/latejoin_injection_cooldown_middle = 0.5*(GLOB.dynamic_latejoin_delay_max + GLOB.dynamic_latejoin_delay_min) latejoin_injection_cooldown = round(CLAMP(EXP_DISTRIBUTION(latejoin_injection_cooldown_middle), GLOB.dynamic_latejoin_delay_min, GLOB.dynamic_latejoin_delay_max)) + world.time /// Refund threat, but no more than threat_level. /datum/game_mode/dynamic/proc/refund_threat(regain) threat = min(threat_level,threat+regain) + SSblackbox.record_feedback("tally","dynamic_threat",regain,"Refunded threat") log_threat("[regain] refunded. Threat is now [threat].", verbose = TRUE) /// Generate threat and increase the threat_level if it goes beyond, capped at 100 @@ -822,11 +848,13 @@ GLOBAL_VAR_INIT(dynamic_forced_threat_level, -1) threat = min(100, threat+gain) if(threat > threat_level) threat_level = threat + SSblackbox.record_feedback("tally","dynamic_threat",gain,"Created threat") log_threat("[gain] created. Threat is now [threat] and threat level is now [threat_level].", verbose = TRUE) /// Expend threat, can't fall under 0. /datum/game_mode/dynamic/proc/spend_threat(cost) threat = max(threat-cost,0) + SSblackbox.record_feedback("tally","dynamic_threat",cost,"Threat spent") log_threat("[cost] spent. Threat is now [threat].", verbose = TRUE) /// Turns the value generated by lorentz distribution to threat value between 0 and 100. diff --git a/code/game/gamemodes/dynamic/dynamic_rulesets.dm b/code/game/gamemodes/dynamic/dynamic_rulesets.dm index 0c8ec0a2b8..7f6ea088a1 100644 --- a/code/game/gamemodes/dynamic/dynamic_rulesets.dm +++ b/code/game/gamemodes/dynamic/dynamic_rulesets.dm @@ -80,6 +80,9 @@ /// Delay for when execute will get called from the time of post_setup (roundstart) or process (midround/latejoin). /// Make sure your ruleset works with execute being called during the game when using this, and that the clean_up proc reverts it properly in case of faliure. var/delay = 0 + /// Whether or not recent-round weight values are taken into account for this ruleset. + /// Weight reduction uses the same values as secret's recent-round mode weight reduction. + var/always_max_weight = FALSE /datum/dynamic_ruleset/New() ..() @@ -91,8 +94,15 @@ var/costs = CONFIG_GET(keyed_list/dynamic_cost) var/requirementses = CONFIG_GET(keyed_list/dynamic_requirements) // can't damn well use requirements var/high_population_requirements = CONFIG_GET(keyed_list/dynamic_high_population_requirement) + var/list/repeated_mode_adjust = CONFIG_GET(number_list/repeated_mode_adjust) if(config_tag in weights) - weight = weights[config_tag] + var/weight_mult = 1 + if(!always_max_weight && SSpersistence.saved_dynamic_rules.len == 3 && repeated_mode_adjust.len == 3) + var/saved_dynamic_rules = SSpersistence.saved_dynamic_rules + for(var/i in 1 to 3) + if(config_tag in saved_dynamic_rules[i]) + weight_mult -= (repeated_mode_adjust[i]/100) + weight = weights[config_tag] * weight_mult if(config_tag in costs) cost = costs[config_tag] if(config_tag in requirementses) @@ -115,12 +125,15 @@ /// If your rule has extra checks, such as counting security officers, do that in ready() instead /datum/dynamic_ruleset/proc/acceptable(population = 0, threat_level = 0) if(minimum_players > population) + SSblackbox.record_feedback("tally","dynamic",1,"Times rulesets rejected due to low pop") return FALSE if(maximum_players > 0 && population > maximum_players) + SSblackbox.record_feedback("tally","dynamic",1,"Times rulesets rejected due to high pop") return FALSE if (population >= GLOB.dynamic_high_pop_limit) indice_pop = 10 if(threat_level < high_population_requirement) + SSblackbox.record_feedback("tally","dynamic",1,"Times rulesets rejected due to not enough threat level") log_game("DYNAMIC: [name] did not reach threat level threshold: [threat_level]/[high_population_requirement]") return FALSE else @@ -132,6 +145,7 @@ log_game("DYNAMIC: requirements and antag_cap lists have different lengths in ruleset [name]. Likely config issue, report this.") indice_pop = min(requirements.len,round(population/pop_per_requirement)+1) if(threat_level < requirements[indice_pop]) + SSblackbox.record_feedback("tally","dynamic",1,"Times rulesets rejected due to not enough threat level") log_game("DYNAMIC: [name] did not reach threat level threshold: [threat_level]/[requirements[indice_pop]]") return FALSE else @@ -178,6 +192,7 @@ /// IMPORTANT: If ready() returns TRUE, that means pre_execute() or execute() should never fail! /datum/dynamic_ruleset/proc/ready(forced = 0) if (required_candidates > candidates.len) + SSblackbox.record_feedback("tally","dynamic",1,"Times rulesets rejected due to not enough candidates") return FALSE return TRUE @@ -212,6 +227,24 @@ /datum/dynamic_ruleset/proc/check_finished() return FALSE +/// Returns a list to be displayed on statbus. +/datum/dynamic_ruleset/proc/get_blackbox_info() + var/list/ruleset_data = list() + ruleset_data["name"] = name + ruleset_data["rule_type"] = ruletype + ruleset_data["cost"] = total_cost + ruleset_data["weight"] = weight + ruleset_data["scaled_times"] = scaled_times + ruleset_data["antagonist_type"] = antag_datum + ruleset_data["population_tier"] = indice_pop + ruleset_data["assigned"] = list() + for (var/datum/mind/M in assigned) + var/assigned_data = list() + assigned_data["key"] = M.key + assigned_data["name"] = M.name + ruleset_data["assigned"] += list(assigned_data) + return ruleset_data + ////////////////////////////////////////////// // // // ROUNDSTART RULESETS // diff --git a/code/game/gamemodes/dynamic/dynamic_rulesets_events.dm b/code/game/gamemodes/dynamic/dynamic_rulesets_events.dm index 4ac8cc91d3..b6cd313bfc 100644 --- a/code/game/gamemodes/dynamic/dynamic_rulesets_events.dm +++ b/code/game/gamemodes/dynamic/dynamic_rulesets_events.dm @@ -3,6 +3,17 @@ var/typepath // typepath of the event var/triggering +/datum/dynamic_ruleset/event/get_blackbox_info() + var/list/ruleset_data = list() + ruleset_data["name"] = name + ruleset_data["rule_type"] = ruletype + ruleset_data["cost"] = total_cost + ruleset_data["weight"] = weight + ruleset_data["scaled_times"] = scaled_times + ruleset_data["event_type"] = typepath + ruleset_data["population_tier"] = indice_pop + return ruleset_data + /datum/dynamic_ruleset/event/execute() var/datum/round_event/E = new typepath() E.current_players = get_active_player_count(alive_check = 1, afk_check = 1, human_check = 1) @@ -26,6 +37,7 @@ var/threat = round(mode.threat_level/10) if (job_check < required_enemies[threat]) + SSblackbox.record_feedback("tally","dynamic",1,"Times rulesets rejected due to not enough enemy roles") return FALSE return TRUE @@ -125,6 +137,7 @@ requirements = list(5,5,5,5,5,5,5,5,5,5) high_population_requirement = 5 repeatable = TRUE + always_max_weight = TRUE ////////////////////////////////////////////// // // @@ -146,12 +159,15 @@ /datum/dynamic_ruleset/event/meteor_wave/ready() if(mode.threat_level > 40 && mode.threat >= 25 && prob(20)) + name = "Meteor Wave: Threatening" cost = 25 typepath = /datum/round_event/meteor_wave/threatening else if(mode.threat_level > 50 && mode.threat >= 40 && prob(30)) + name = "Meteor Wave: Catastrophic" cost = 40 typepath = /datum/round_event/meteor_wave/catastrophic else + name = "Meteor Wave: Normal" cost = 15 typepath = /datum/round_event/meteor_wave return ..() @@ -280,6 +296,7 @@ requirements = list(5,5,5,5,5,5,5,5,5,5) high_population_requirement = 5 repeatable = TRUE + always_max_weight = TRUE /datum/dynamic_ruleset/event/space_dust name = "Minor Space Dust" @@ -293,6 +310,7 @@ requirements = list(5,5,5,5,5,5,5,5,5,5) high_population_requirement = 5 repeatable = TRUE + always_max_weight = TRUE /datum/dynamic_ruleset/event/major_dust name = "Major Space Dust" @@ -332,6 +350,7 @@ requirements = list(101,101,101,5,5,5,5,5,5,5) high_population_requirement = 5 repeatable = TRUE + always_max_weight = TRUE /datum/dynamic_ruleset/event/radiation_storm name = "Radiation Storm" diff --git a/code/game/gamemodes/dynamic/dynamic_rulesets_latejoin.dm b/code/game/gamemodes/dynamic/dynamic_rulesets_latejoin.dm index 5810fd0ae0..fe9347d9d5 100644 --- a/code/game/gamemodes/dynamic/dynamic_rulesets_latejoin.dm +++ b/code/game/gamemodes/dynamic/dynamic_rulesets_latejoin.dm @@ -36,9 +36,9 @@ continue // Dead players cannot count as opponents if (M.mind && M.mind.assigned_role && (M.mind.assigned_role in enemy_roles) && (!(M in candidates) || (M.mind.assigned_role in restricted_roles))) job_check++ // Checking for "enemies" (such as sec officers). To be counters, they must either not be candidates to that rule, or have a job that restricts them from it - var/threat = round(mode.threat_level/10) if (job_check < required_enemies[threat]) + SSblackbox.record_feedback("tally","dynamic",1,"Times rulesets rejected due to not enough enemy roles") return FALSE return ..() @@ -69,6 +69,7 @@ high_population_requirement = 15 repeatable = TRUE flags = TRAITOR_RULESET + always_max_weight = TRUE ////////////////////////////////////////////// // // diff --git a/code/game/gamemodes/dynamic/dynamic_rulesets_midround.dm b/code/game/gamemodes/dynamic/dynamic_rulesets_midround.dm index 8cda402ebf..91ac73d142 100644 --- a/code/game/gamemodes/dynamic/dynamic_rulesets_midround.dm +++ b/code/game/gamemodes/dynamic/dynamic_rulesets_midround.dm @@ -87,6 +87,7 @@ var/threat = round(mode.threat_level/10) if (job_check < required_enemies[threat]) + SSblackbox.record_feedback("tally","dynamic",1,"Times rulesets rejected due to not enough enemy roles") return FALSE return TRUE @@ -94,11 +95,8 @@ var/list/possible_candidates = list() possible_candidates.Add(dead_players) possible_candidates.Add(list_observers) - send_applications(possible_candidates) - if(assigned.len > 0) - return TRUE - else - return FALSE + var/application_successful = send_applications(possible_candidates) + return assigned.len > 0 && application_successful /// This sends a poll to ghosts if they want to be a ghost spawn from a ruleset. /datum/dynamic_ruleset/midround/from_ghosts/proc/send_applications(list/possible_volunteers = list()) @@ -113,25 +111,18 @@ if(!candidates || candidates.len <= required_candidates) message_admins("The ruleset [name] did not receive enough applications.") log_game("DYNAMIC: The ruleset [name] did not receive enough applications.") - mode.refund_threat(cost) - mode.log_threat("Rule [name] refunded [cost] (not receive enough applications)",verbose=TRUE) - mode.executed_rules -= src - return + return FALSE message_admins("[candidates.len] players volunteered for the ruleset [name].") log_game("DYNAMIC: [candidates.len] players volunteered for [name].") review_applications() + return TRUE /// Here is where you can check if your ghost applicants are valid for the ruleset. /// Called by send_applications(). /datum/dynamic_ruleset/midround/from_ghosts/proc/review_applications() for (var/i = 1, i <= required_candidates, i++) if(candidates.len <= 0) - if(i == 1) - // We have found no candidates so far and we are out of applicants. - mode.refund_threat(cost) - mode.log_threat("Rule [name] refunded [cost] (all applications invalid)",verbose=TRUE) - mode.executed_rules -= src break var/mob/applicant = pick(candidates) candidates -= applicant @@ -189,6 +180,7 @@ repeatable = TRUE high_population_requirement = 15 flags = TRAITOR_RULESET + always_max_weight = TRUE /datum/dynamic_ruleset/midround/autotraitor/acceptable(population = 0, threat = 0) var/player_count = mode.current_players[CURRENT_LIVING_PLAYERS].len @@ -301,6 +293,7 @@ /datum/dynamic_ruleset/midround/from_ghosts/wizard/ready(forced = FALSE) if (required_candidates > (dead_players.len + list_observers.len)) + SSblackbox.record_feedback("tally","dynamic",1,"Times rulesets rejected due to not enough ghosts") return FALSE if(GLOB.wizardstart.len == 0) log_admin("Cannot accept Wizard ruleset. Couldn't find any wizard spawn points.") @@ -363,6 +356,7 @@ /datum/dynamic_ruleset/midround/from_ghosts/nuclear/ready(forced = FALSE) if (required_candidates > (dead_players.len + list_observers.len)) + SSblackbox.record_feedback("tally","dynamic",1,"Times rulesets rejected due to not enough ghosts") return FALSE return ..() @@ -399,6 +393,7 @@ /datum/dynamic_ruleset/midround/from_ghosts/blob/ready(forced = FALSE) if (required_candidates > (dead_players.len + list_observers.len)) + SSblackbox.record_feedback("tally","dynamic",1,"Times rulesets rejected due to not enough ghosts") return FALSE return ..() @@ -430,6 +425,7 @@ /datum/dynamic_ruleset/midround/from_ghosts/xenomorph/ready(forced = FALSE) if (required_candidates > (dead_players.len + list_observers.len)) + SSblackbox.record_feedback("tally","dynamic",1,"Times rulesets rejected due to not enough ghosts") return FALSE return ..() @@ -529,6 +525,7 @@ /datum/dynamic_ruleset/midround/from_ghosts/sentient_disease/ready(forced = FALSE) if (required_candidates > (dead_players.len + list_observers.len)) + SSblackbox.record_feedback("tally","dynamic",1,"Times rulesets rejected due to not enough ghosts") return FALSE return ..() @@ -567,6 +564,7 @@ if(deadMobs < REVENANT_SPAWN_THRESHOLD) return FALSE if(required_candidates > (dead_players.len + list_observers.len)) + SSblackbox.record_feedback("tally","dynamic",1,"Times rulesets rejected due to not enough ghosts") return FALSE for(var/mob/living/L in GLOB.dead_mob_list) //look for any dead bodies var/turf/T = get_turf(L) @@ -614,6 +612,7 @@ /datum/dynamic_ruleset/midround/from_ghosts/slaughter_demon/ready(forced = FALSE) if(required_candidates > (dead_players.len + list_observers.len)) + SSblackbox.record_feedback("tally","dynamic",1,"Times rulesets rejected due to not enough ghosts") return FALSE for(var/obj/effect/landmark/carpspawn/L in GLOB.landmarks_list) if(isturf(L.loc)) @@ -665,6 +664,7 @@ /datum/dynamic_ruleset/midround/from_ghosts/abductors/ready(forced = FALSE) if(required_candidates > (dead_players.len + list_observers.len)) + SSblackbox.record_feedback("tally","dynamic",1,"Times rulesets rejected due to not enough ghosts") return FALSE team = new /datum/team/abductor_team if(team.team_number > ABDUCTOR_MAX_TEAMS) @@ -704,6 +704,7 @@ /datum/dynamic_ruleset/midround/from_ghosts/ninja/ready(forced = FALSE) if(required_candidates > (dead_players.len + list_observers.len)) + SSblackbox.record_feedback("tally","dynamic",1,"Times rulesets rejected due to not enough ghosts") return FALSE if(!spawn_loc) var/list/spawn_locs = list() @@ -744,3 +745,31 @@ #undef ABDUCTOR_MAX_TEAMS #undef REVENANT_SPAWN_THRESHOLD + +////////////////////////////////////////////// +// // +// BLOODSUCKERS // +// // +////////////////////////////////////////////// + +/datum/dynamic_ruleset/latejoin/bloodsucker + name = "Bloodsucker Infiltrator" + config_tag = "latejoin_bloodsucker" + antag_datum = ANTAG_DATUM_BLOODSUCKER + antag_flag = ROLE_TRAITOR + restricted_roles = list("AI", "Cyborg") + protected_roles = list("Security Officer", "Warden", "Detective", "Head of Security", "Captain", "Head of Personnel", "Chief Engineer", "Chief Medical Officer", "Research Director", "Quartermaster") + required_candidates = 1 + weight = 3 + cost = 10 + requirements = list(90,80,70,60,55,50,45,40,35,30) + high_population_requirement = 30 + repeatable = TRUE + +/datum/dynamic_ruleset/latejoin/bloodsucker/execute() + var/mob/M = pick(candidates) + assigned += M.mind + M.mind.special_role = antag_flag + if(mode.make_bloodsucker(M.mind)) + mode.bloodsuckers += M + return TRUE diff --git a/code/game/gamemodes/dynamic/dynamic_rulesets_roundstart.dm b/code/game/gamemodes/dynamic/dynamic_rulesets_roundstart.dm index 56b02a1364..e5bb0af464 100644 --- a/code/game/gamemodes/dynamic/dynamic_rulesets_roundstart.dm +++ b/code/game/gamemodes/dynamic/dynamic_rulesets_roundstart.dm @@ -21,6 +21,7 @@ requirements = list(50,50,50,50,50,50,50,50,50,50) high_population_requirement = 40 antag_cap = list(1,1,1,1,2,2,2,2,3,3) + always_max_weight = TRUE var/autotraitor_cooldown = 450 // 15 minutes (ticks once per 2 sec) /datum/dynamic_ruleset/roundstart/traitor/pre_execute() @@ -778,3 +779,42 @@ var/ramp_up_final = CLAMP(round(meteorminutes/rampupdelta), 1, 10) spawn_meteors(ramp_up_final, wavetype) + +////////////////////////////////////////////// +// // +// BLOODSUCKERS // +// // +////////////////////////////////////////////// + +/datum/dynamic_ruleset/roundstart/bloodsucker + name = "Bloodsuckers" + config_tag = "bloodsucker" + persistent = TRUE + antag_flag = ROLE_BLOODSUCKER + antag_datum = ANTAG_DATUM_BLOODSUCKER + minimum_required_age = 0 + protected_roles = list("Security Officer", "Warden", "Detective", "Head of Security", "Captain", "Head of Personnel", "Chief Engineer", "Chief Medical Officer", "Research Director", "Quartermaster") + restricted_roles = list("Cyborg", "AI") + required_candidates = 1 + weight = 2 + cost = 15 + scaling_cost = 10 + requirements = list(90,80,70,60,50,50,50,50,50,50) + high_population_requirement = 50 + antag_cap = list(1,1,1,1,1,2,2,2,2,2) + +/datum/dynamic_ruleset/roundstart/bloodsucker/pre_execute() + var/num_bloodsuckers = antag_cap[indice_pop] * (scaled_times + 1) + for (var/i = 1 to num_bloodsuckers) + var/mob/M = pick_n_take(candidates) + assigned += M.mind + M.mind.special_role = ROLE_BLOODSUCKER + M.mind.restricted_roles = restricted_roles + return TRUE + +/datum/dynamic_ruleset/roundstart/bloodsucker/execute() + mode.check_start_sunlight() + for(var/datum/mind/M in assigned) + if(mode.make_bloodsucker(M)) + mode.bloodsuckers += M + return TRUE diff --git a/code/game/gamemodes/game_mode.dm b/code/game/gamemodes/game_mode.dm index 4d7b346241..3a258599b7 100644 --- a/code/game/gamemodes/game_mode.dm +++ b/code/game/gamemodes/game_mode.dm @@ -81,6 +81,7 @@ ///Everyone should now be on the station and have their normal gear. This is the place to give the special roles extra things /datum/game_mode/proc/post_setup(report) //Gamemodes can override the intercept report. Passing TRUE as the argument will force a report. + //finalize_monster_hunters() Disabled for now if(!report) report = !CONFIG_GET(flag/no_intercept_report) addtimer(CALLBACK(GLOBAL_PROC, .proc/display_roundstart_logout_report), ROUNDSTART_LOGOUT_REPORT_TIME) @@ -305,48 +306,88 @@ // The odds become: // Player A: 150 / 250 = 0.6 = 60% // Player B: 100 / 250 = 0.4 = 40% -/datum/game_mode/proc/antag_pick(list/datum/candidates) + +//Use return list if you want a list, with the arg being the number you want returned. +//WARNING: THIS PROC DOES NOT TAKE INTO ACCOUNT WHAT SSPersistence ALREADY HAS FOR "ADJUST ANTAG REP". If this is used more than once +//and the person rolls more than once, they will not get even more deduction! +//More efficient if you use return list instead of calling this multiple times +//fail_default_pick makes it use pick() instead of antag rep if it can't find anyone +//allow_zero_if_insufficient allows it to pick people with zero rep if there isn't enough antags +/datum/game_mode/proc/antag_pick(list/datum/mind/candidates, return_list = FALSE, fail_default_pick = TRUE, allow_zero_if_insufficient = TRUE) if(!CONFIG_GET(flag/use_antag_rep)) // || candidates.len <= 1) return pick(candidates) - // Tickets start at 100 - var/DEFAULT_ANTAG_TICKETS = CONFIG_GET(number/default_antag_tickets) + //whoever named the config entries is a bad person :( - // You may use up to 100 extra tickets (double your odds) - var/MAX_TICKETS_PER_ROLL = CONFIG_GET(number/max_tickets_per_roll) - - - var/total_tickets = 0 - - MAX_TICKETS_PER_ROLL += DEFAULT_ANTAG_TICKETS - - var/p_ckey - var/p_rep - - for(var/datum/mind/mind in candidates) - p_ckey = ckey(mind.key) - total_tickets += min(SSpersistence.antag_rep[p_ckey] + DEFAULT_ANTAG_TICKETS, MAX_TICKETS_PER_ROLL) - - var/antag_select = rand(1,total_tickets) - var/current = 1 - - for(var/datum/mind/mind in candidates) - p_ckey = ckey(mind.key) - p_rep = SSpersistence.antag_rep[p_ckey] - - var/previous = current - var/spend = min(p_rep + DEFAULT_ANTAG_TICKETS, MAX_TICKETS_PER_ROLL) - current += spend - - if(antag_select >= previous && antag_select <= (current-1)) - SSpersistence.antag_rep_change[p_ckey] = -(spend - DEFAULT_ANTAG_TICKETS) - -// WARNING("AR_DEBUG: Player [mind.key] won spending [spend] tickets from starting value [SSpersistence.antag_rep[p_ckey]]") - - return mind - - WARNING("Something has gone terribly wrong. /datum/game_mode/proc/antag_pick failed to select a candidate. Falling back to pick()") - return pick(candidates) + //Tickets you get for free + var/free_tickets = CONFIG_GET(number/default_antag_tickets) + //Max extra tickets you can use + var/additional_tickets = CONFIG_GET(number/max_tickets_per_roll) + + var/list/ckey_to_mind = list() //this is admittedly shitcode but I'm webediting + var/list/prev_tickets = SSpersistence.antag_rep //cache for hyper-speed in theory. how many tickets someone has stored + var/list/curr_tickets = list() //how many tickets someone has for *this* antag roll, so with the free tickets + var/list/datum/mind/insufficient = list() //who got cucked out of an antag roll due to not having *any* tickets + for(var/datum/mind/M in candidates) + var/mind_ckey = ckey(M.key) + var/can_spend = min(prev_tickets[mind_ckey], additional_tickets) //they can only spend up to config/max_tickets_per_roll + var/amount = can_spend + free_tickets //but they get config/default_antag_tickets for free + if(amount <= 0) //if they don't have any + insufficient += M //too bad! + continue + curr_tickets[mind_ckey] = amount + ckey_to_mind[mind_ckey] = M //make sure we can look them up after picking + + if(!return_list) //return a single guy + var/ckey + if(length(curr_tickets)) + ckey = pickweight(curr_tickets) + SSpersistence.antag_rep_change[ckey] = -(curr_tickets[ckey] - free_tickets) //deduct what they spent + var/mind = ckey_to_mind[ckey] || (allow_zero_if_insufficient? pick(insufficient) : null) //we want their mind + if(!mind) //no mind + var/warning = "WARNING: No antagonists were successfully picked by /datum/gamemode/proc/antag_pick()![fail_default_pick? " Defaulting to pick()!":""]" + message_admins(warning) + log_game(warning) + if(fail_default_pick) + mind = pick(candidates) + return mind + else //the far more efficient and proper use of this, to get a list + var/list/rolled = list() + var/list/spend_tickets = list() + for(var/i in 1 to return_list) + if(!length(curr_tickets)) //ah heck, we're out of candidates.. + break + var/ckey = pickweight(curr_tickets) //pick + rolled += ckey //add + spend_tickets[ckey] = curr_tickets[ckey] - free_tickets + curr_tickets -= ckey //don't roll them again + var/missing = return_list - length(rolled) + var/list/add + if((missing > 0) && allow_zero_if_insufficient) //need more.. + for(var/i in 1 to missing) + if(!length(insufficient)) + break //still not enough + var/datum/mind/M = pick_n_take(insufficient) + add += M + if(!length(rolled) && !length(add)) //if no one could normally roll AND no one can zero roll + var/warning = "WARNING: No antagonists were successfully picked by /datum/gamemode/proc/antag_pick()![fail_default_pick? " Defaulting to pick()!":""]" + message_admins(warning) + log_game(warning) + var/list/failed = list() + if(fail_default_pick) + var/list/C = candidates.Copy() + for(var/i in 1 to return_list) + if(!length(C)) + break + failed += pick_n_take(C) + return failed //Wew, no one qualified! + for(var/i in 1 to length(rolled)) + var/ckey = rolled[i] + SSpersistence.antag_rep_change[ckey] = -(spend_tickets[ckey]) //deduct what all of the folks who rolled spent + rolled[i] = ckey_to_mind[ckey] //whoever called us wants minds, not ckeys + if(add) + rolled += add + return rolled /datum/game_mode/proc/get_players_for_role(role) var/list/players = list() diff --git a/modular_citadel/code/game/gamemodes/gangs/dominator.dm b/code/game/gamemodes/gangs/dominator.dm similarity index 100% rename from modular_citadel/code/game/gamemodes/gangs/dominator.dm rename to code/game/gamemodes/gangs/dominator.dm diff --git a/modular_citadel/code/game/gamemodes/gangs/dominator_countdown.dm b/code/game/gamemodes/gangs/dominator_countdown.dm similarity index 100% rename from modular_citadel/code/game/gamemodes/gangs/dominator_countdown.dm rename to code/game/gamemodes/gangs/dominator_countdown.dm diff --git a/modular_citadel/code/game/gamemodes/gangs/gang.dm b/code/game/gamemodes/gangs/gang.dm similarity index 100% rename from modular_citadel/code/game/gamemodes/gangs/gang.dm rename to code/game/gamemodes/gangs/gang.dm diff --git a/modular_citadel/code/game/gamemodes/gangs/gang_datums.dm b/code/game/gamemodes/gangs/gang_datums.dm similarity index 100% rename from modular_citadel/code/game/gamemodes/gangs/gang_datums.dm rename to code/game/gamemodes/gangs/gang_datums.dm diff --git a/modular_citadel/code/game/gamemodes/gangs/gang_decals.dm b/code/game/gamemodes/gangs/gang_decals.dm similarity index 100% rename from modular_citadel/code/game/gamemodes/gangs/gang_decals.dm rename to code/game/gamemodes/gangs/gang_decals.dm diff --git a/modular_citadel/code/game/gamemodes/gangs/gang_hud.dm b/code/game/gamemodes/gangs/gang_hud.dm similarity index 100% rename from modular_citadel/code/game/gamemodes/gangs/gang_hud.dm rename to code/game/gamemodes/gangs/gang_hud.dm diff --git a/modular_citadel/code/game/gamemodes/gangs/gang_items.dm b/code/game/gamemodes/gangs/gang_items.dm similarity index 100% rename from modular_citadel/code/game/gamemodes/gangs/gang_items.dm rename to code/game/gamemodes/gangs/gang_items.dm diff --git a/modular_citadel/code/game/gamemodes/gangs/gang_pen.dm b/code/game/gamemodes/gangs/gang_pen.dm similarity index 100% rename from modular_citadel/code/game/gamemodes/gangs/gang_pen.dm rename to code/game/gamemodes/gangs/gang_pen.dm diff --git a/modular_citadel/code/game/gamemodes/gangs/gangs.dm b/code/game/gamemodes/gangs/gangs.dm similarity index 100% rename from modular_citadel/code/game/gamemodes/gangs/gangs.dm rename to code/game/gamemodes/gangs/gangs.dm diff --git a/modular_citadel/code/game/gamemodes/gangs/gangtool.dm b/code/game/gamemodes/gangs/gangtool.dm similarity index 100% rename from modular_citadel/code/game/gamemodes/gangs/gangtool.dm rename to code/game/gamemodes/gangs/gangtool.dm diff --git a/modular_citadel/code/game/gamemodes/gangs/implant_gang.dm b/code/game/gamemodes/gangs/implant_gang.dm similarity index 100% rename from modular_citadel/code/game/gamemodes/gangs/implant_gang.dm rename to code/game/gamemodes/gangs/implant_gang.dm diff --git a/code/game/gamemodes/revolution/revolution.dm b/code/game/gamemodes/revolution/revolution.dm index 8459819b5b..74554ac9f8 100644 --- a/code/game/gamemodes/revolution/revolution.dm +++ b/code/game/gamemodes/revolution/revolution.dm @@ -14,8 +14,8 @@ false_report_weight = 10 restricted_jobs = list("AI", "Cyborg") protected_jobs = list("Security Officer", "Warden", "Detective", "Head of Security", "Captain", "Head of Personnel", "Chief Engineer", "Chief Medical Officer", "Research Director", "Quartermaster") - required_players = 30 - required_enemies = 2 + required_players = 20 + required_enemies = 1 recommended_enemies = 3 enemy_minimum_age = 14 diff --git a/code/game/machinery/Beacon.dm b/code/game/machinery/Beacon.dm index 3d0931d534..c98795c90b 100644 --- a/code/game/machinery/Beacon.dm +++ b/code/game/machinery/Beacon.dm @@ -25,10 +25,10 @@ // update the invisibility and icon /obj/machinery/bluespace_beacon/hide(intact) invisibility = intact ? INVISIBILITY_MAXIMUM : 0 - updateicon() + update_icon() // update the icon_state -/obj/machinery/bluespace_beacon/proc/updateicon() +/obj/machinery/bluespace_beacon/update_icon() var/state="floor_beacon" if(invisibility) @@ -45,4 +45,4 @@ else if (Beacon.loc != loc) Beacon.forceMove(loc) - updateicon() + update_icon() diff --git a/code/game/machinery/Sleeper.dm b/code/game/machinery/Sleeper.dm index 3f3bacc64f..520721560a 100644 --- a/code/game/machinery/Sleeper.dm +++ b/code/game/machinery/Sleeper.dm @@ -181,12 +181,14 @@ open_machine() /obj/machinery/sleeper/AltClick(mob/user) + . = ..() if(!user.canUseTopic(src, !issilicon(user))) return if(state_open) close_machine() else open_machine() + return TRUE /obj/machinery/sleeper/examine(mob/user) . = ..() diff --git a/code/game/machinery/_machinery.dm b/code/game/machinery/_machinery.dm index ff7383cd9e..5f44fccdac 100644 --- a/code/game/machinery/_machinery.dm +++ b/code/game/machinery/_machinery.dm @@ -181,8 +181,9 @@ Class Procs: if(isliving(A)) var/mob/living/L = A L.update_canmove() - SEND_SIGNAL(src, COMSIG_MACHINE_EJECT_OCCUPANT, occupant) - occupant = null + if(occupant) + SEND_SIGNAL(src, COMSIG_MACHINE_EJECT_OCCUPANT, occupant) + occupant = null /obj/machinery/proc/can_be_occupant(atom/movable/am) return occupant_typecache ? is_type_in_typecache(am, occupant_typecache) : isliving(am) diff --git a/code/game/machinery/aug_manipulator.dm b/code/game/machinery/aug_manipulator.dm index b9d63e5771..b41910f010 100644 --- a/code/game/machinery/aug_manipulator.dm +++ b/code/game/machinery/aug_manipulator.dm @@ -132,8 +132,8 @@ ..() if(!user.canUseTopic(src)) return - else - eject_part(user) + eject_part(user) + return TRUE /obj/machinery/aug_manipulator/power_change() ..() diff --git a/code/game/machinery/bloodbankgen.dm b/code/game/machinery/bloodbankgen.dm index c489f6c9c9..c92e55084d 100644 --- a/code/game/machinery/bloodbankgen.dm +++ b/code/game/machinery/bloodbankgen.dm @@ -12,7 +12,6 @@ var/filling = FALSE var/obj/item/reagent_containers/blood/bag = null var/obj/item/reagent_containers/blood/outbag = null - var/bloodstored = 0 var/maxbloodstored = 1000 var/menustat = "menu" var/efficiency = 0 @@ -20,7 +19,7 @@ /obj/machinery/bloodbankgen/Initialize() . = ..() - create_reagents(1000) + create_reagents(maxbloodstored, AMOUNT_VISIBLE) update_icon() /obj/machinery/bloodbankgen/Destroy() @@ -28,12 +27,13 @@ QDEL_NULL(outbag) return ..() -/obj/machinery/bloodbankgen/contents_explosion(severity, target) - ..() +/obj/machinery/bloodbankgen/examine(mob/user) + . = ..() if(bag) - bag.ex_act(severity, target) + . += "It has \a [bag.name] hooked to its input slot. The counter reads: \"Current Capacity: [bag.reagents.total_volume] of [bag.reagents.maximum_volume]\"" if(outbag) - outbag.ex_act(severity, target) + . += "It has \a [bag.name] hooked to its output slot. The counter reads: \"Current Capacity: [outbag.reagents.total_volume] of [outbag.reagents.maximum_volume]\"" + /obj/machinery/bloodbankgen/handle_atom_del(atom/A) ..() @@ -115,80 +115,48 @@ /obj/machinery/bloodbankgen/process() if(!is_operational()) - return PROCESS_KILL - - bloodstored = reagents.total_volume + return var/transfer_amount = 20 if(draining) - if(reagents.total_volume >= reagents.maximum_volume) - draining = FALSE + if(reagents.total_volume >= reagents.maximum_volume || !bag || !bag.reagents.total_volume) + beep_stop_pumping() return - - if(bag) - if(bag.reagents.total_volume) - var/datum/reagent/blood/B = bag.reagents.has_reagent("blood") - if(B) - var/amount = reagents.maximum_volume - reagents.total_volume //monitor the machine's internal storage - amount = min(amount, transfer_amount) - if(!amount) - draining = FALSE - updateUsrDialog() - visible_message("[src] beeps loudly.") - playsound(loc, 'sound/machines/twobeep.ogg', 50, 1) - return - - if(bag.blood_type == "SY") //no infinite loops using synthetics. - reagents.add_reagent("syntheticblood", amount) - else - reagents.add_reagent("syntheticblood", (amount+(5*efficiency))) - - if(bag.reagents.total_volume >= amount) - bag.reagents.remove_reagent("blood", amount) - else - visible_message("[src] beeps loudly.") - playsound(loc, 'sound/machines/twobeep.ogg', 50, 1) - draining = FALSE - - bag.update_icon() - update_icon() - updateUsrDialog() - else - draining = FALSE - updateUsrDialog() + var/blood_amount = bag.reagents.get_reagent_amount("blood") + //monitor the machine and blood bag's reagents storage. + var/amount = min(blood_amount, min(transfer_amount, reagents.maximum_volume - reagents.total_volume)) + if(!amount) + beep_stop_pumping() return + var/bonus = bag.blood_type == "SY" ? 0 : 5 * efficiency //no infinite loops using synthetics. + reagents.add_reagent("syntheticblood", amount + bonus) + bag.reagents.remove_reagent("blood", amount) + update_icon() if(filling) - if(!reagents || !reagents.total_volume) - filling = FALSE //there ain't anything in the machine yo. + if(!reagents.total_volume || !outbag || outbag.reagents.total_volume >= outbag.reagents.maximum_volume) + beep_stop_pumping("[src] pings.", TRUE) return - if(outbag && outbag.reagents.total_volume < outbag.reagents.maximum_volume) - var/amount = outbag.reagents.maximum_volume - outbag.reagents.total_volume //monitor the output bag's internal storage - amount = min(amount, transfer_amount) - if(!amount) - filling = FALSE - visible_message("[src] pings.") - playsound(loc, 'sound/machines/beep.ogg', 50, 1) - updateUsrDialog() - return + //monitor the output bag's reagents storage. + var/amount = min(transfer_amount, outbag.reagents.maximum_volume - outbag.reagents.total_volume) + reagents.trans_to(outbag, amount) + update_icon() - reagents.trans_to(outbag, amount) - outbag.update_icon() - update_icon() - updateUsrDialog() - else - visible_message("[src] pings.") - playsound(loc, 'sound/machines/beep.ogg', 50, 1) - filling = FALSE - updateUsrDialog() - return +/obj/machinery/bloodbankgen/proc/beep_stop_pumping(msg = "[src] beeps loudly.", out_instead_of_in = FALSE) + if(out_instead_of_in) + filling = FALSE + else + draining = FALSE + updateUsrDialog() + audible_message(msg) + playsound(loc, 'sound/machines/twobeep.ogg', 50, 1) /obj/machinery/bloodbankgen/attackby(obj/item/O, mob/user, params) if(user.a_intent == INTENT_HARM) return ..() - if(default_deconstruction_screwdriver(user, "bloodbank-off", "bloodbank-off", O)) + if(default_deconstruction_screwdriver(user, "bloodbank-off", "bloodbank-off", O) || default_unfasten_wrench(user, O, 20) == SUCCESSFUL_UNFASTEN) if(bag) var/obj/item/reagent_containers/blood/B = bag B.forceMove(drop_location()) @@ -204,31 +172,37 @@ return if(istype(O, /obj/item/reagent_containers/blood)) - . = 1 //no afterattack - if(!panel_open) - if(bag && outbag) - to_chat(user, "This machine already has bags attached.") - - if(!bag && !outbag) - var/choice = alert(user, "Choose where to place [O]", "", "Input", "Cancel", "Output") - switch(choice) - if("Cancel") - return FALSE - if("Input") - attachinput(O, user) - if("Output") - attachoutput(O, user) - else if(!bag) - attachinput(O, user) - else if(!outbag) - attachoutput(O, user) - else - to_chat(user, "Close the maintenance panel first.") - return + . = TRUE //no afterattack + var/msg + if(panel_open) + . += "Close the maintenance panel" + if(!anchored) + . += "[msg ? " and a" : "A"]nchor its bolts" + if(length(msg)) + to_chat(user, "[msg] first.") + return + if(bag && outbag) + to_chat(user, "This machine already has bags attached.") + if(!bag && !outbag) + var/choice = alert(user, "Choose where to place [O]", "", "Input", "Cancel", "Output") + switch(choice) + if("Cancel") + return FALSE + if("Input") + attachinput(O, user) + if("Output") + attachoutput(O, user) + else if(!bag) + attachinput(O, user) + else if(!outbag) + attachoutput(O, user) else to_chat(user, "You cannot put this in [src]!") +/obj/machinery/bloodbankgen/is_operational() + return ..() && anchored + /obj/machinery/bloodbankgen/ui_interact(mob/user) . = ..() @@ -268,7 +242,7 @@ if(!bag && !outbag) dat += "
No containers inside, please insert container.
"
- var/datum/browser/popup = new(user, "bloodbankgen", name, 350, 520)
+ var/datum/browser/popup = new(user, "bloodbankgen", name, 350, 420)
popup.set_content(dat)
popup.open()
@@ -306,6 +280,7 @@
if(usr && Adjacent(usr) && !issiliconoradminghost(usr))
usr.put_in_hands(bag)
bag = null
+ draining = null
update_icon()
/obj/machinery/bloodbankgen/proc/detachoutput()
@@ -314,6 +289,7 @@
if(usr && Adjacent(usr) && !issiliconoradminghost(usr))
usr.put_in_hands(outbag)
outbag = null
+ filling = null
update_icon()
/obj/machinery/bloodbankgen/proc/attachinput(obj/item/O, mob/user)
@@ -339,23 +315,22 @@
to_chat(user, "There is already something in this slot!")
/obj/machinery/bloodbankgen/Topic(href, href_list)
- if(..() || panel_open)
+ . = ..()
+ if(. | !is_operational())
return
usr.set_machine(src)
if(href_list["activateinput"])
activateinput()
- updateUsrDialog()
else if(href_list["detachinput"])
detachinput()
- updateUsrDialog()
else if(href_list["activateoutput"])
activateoutput()
- updateUsrDialog()
else if(href_list["detachoutput"])
detachoutput()
- updateUsrDialog()
+
+ updateUsrDialog()
diff --git a/code/game/machinery/cell_charger.dm b/code/game/machinery/cell_charger.dm
index 1839e44e3b..1c0635fd3d 100644
--- a/code/game/machinery/cell_charger.dm
+++ b/code/game/machinery/cell_charger.dm
@@ -13,7 +13,7 @@
var/chargelevel = -1
var/charge_rate = 500
-/obj/machinery/cell_charger/proc/updateicon()
+/obj/machinery/cell_charger/update_icon()
cut_overlays()
if(charging)
add_overlay(image(charging.icon, charging.icon_state))
@@ -53,7 +53,7 @@
charging = W
user.visible_message("[user] inserts a cell into [src].", "You insert a cell into [src].")
chargelevel = -1
- updateicon()
+ update_icon()
else
if(!charging && default_deconstruction_screwdriver(user, icon_state, icon_state, W))
return
@@ -76,7 +76,7 @@
charging.update_icon()
charging = null
chargelevel = -1
- updateicon()
+ update_icon()
/obj/machinery/cell_charger/attack_hand(mob/user)
. = ..()
@@ -127,4 +127,4 @@
use_power(charge_rate)
charging.give(charge_rate) //this is 2558, efficient batteries exist
- updateicon()
+ update_icon()
diff --git a/code/game/machinery/computer/buildandrepair.dm b/code/game/machinery/computer/buildandrepair.dm
index 056beb2e96..e8e15ff586 100644
--- a/code/game/machinery/computer/buildandrepair.dm
+++ b/code/game/machinery/computer/buildandrepair.dm
@@ -133,12 +133,13 @@
..()
/obj/structure/frame/computer/AltClick(mob/user)
- ..()
+ . = ..()
if(!isliving(user) || !user.canUseTopic(src, BE_CLOSE, ismonkey(user)))
return
if(anchored)
to_chat(usr, "You must unwrench [src] before rotating it!")
- return
+ return TRUE
setDir(turn(dir, -90))
+ return TRUE
diff --git a/code/game/machinery/computer/card.dm b/code/game/machinery/computer/card.dm
index e8e8e1cdd6..3bdb635d39 100644
--- a/code/game/machinery/computer/card.dm
+++ b/code/game/machinery/computer/card.dm
@@ -170,19 +170,19 @@ GLOBAL_VAR_INIT(time_last_changed_position, 0)
return TRUE
/obj/machinery/computer/card/AltClick(mob/user)
- ..()
+ . = ..()
if(!user.canUseTopic(src, !issilicon(user)) || !is_operational())
return
if(inserted_modify_id)
if(id_eject(user, inserted_modify_id))
inserted_modify_id = null
updateUsrDialog()
- return
+ return TRUE
if(inserted_scan_id)
if(id_eject(user, inserted_scan_id))
inserted_scan_id = null
updateUsrDialog()
- return
+ return TRUE
/obj/machinery/computer/card/ui_interact(mob/user)
. = ..()
diff --git a/code/game/machinery/computer/communications.dm b/code/game/machinery/computer/communications.dm
index a8b4608b36..22a523c58b 100755
--- a/code/game/machinery/computer/communications.dm
+++ b/code/game/machinery/computer/communications.dm
@@ -70,7 +70,7 @@
if(check_access(I))
authenticated = 1
auth_id = "[I.registered_name] ([I.assignment])"
- if((20 in I.access))
+ if((ACCESS_CAPTAIN in I.access))
authenticated = 2
playsound(src, 'sound/machines/terminal_on.ogg', 50, 0)
if(obj_flags & EMAGGED)
@@ -279,7 +279,7 @@
// OMG CENTCOM LETTERHEAD
if("MessageCentCom")
- if(authenticated==2)
+ if(authenticated)
if(!checkCCcooldown())
to_chat(usr, "Arrays recycling. Please stand by.")
return
diff --git a/code/game/machinery/computer/launchpad_control.dm b/code/game/machinery/computer/launchpad_control.dm
index d1f450013b..b5d393bce0 100644
--- a/code/game/machinery/computer/launchpad_control.dm
+++ b/code/game/machinery/computer/launchpad_control.dm
@@ -74,8 +74,8 @@
t += "O"//down-right t += "
" t += "
Current offset:
" - t += "
[abs(pad.y_offset)] [pad.y_offset > 0 ? "N":"S"]
" - t += "
[abs(pad.x_offset)] [pad.x_offset > 0 ? "E":"W"]
" + t += "
[abs(pad.y_offset)] [pad.y_offset > 0 ? "N":"S"] \[SET\]
" + t += "
[abs(pad.x_offset)] [pad.x_offset > 0 ? "E":"W"] \[SET\]
" t += "
Launch" t += " Pull" @@ -132,6 +132,16 @@ if(!new_name) return pad.display_name = new_name + + if(href_list["setx"]) + var/newx = input(usr, "Input new x offset", pad.display_name, pad.x_offset) as null|num + if(!isnull(newx)) + pad.x_offset = CLAMP(newx, -pad.range, pad.range) + + if(href_list["sety"]) + var/newy = input(usr, "Input new y offset", pad.display_name, pad.y_offset) as null|num + if(!isnull(newy)) + pad.y_offset = CLAMP(newy, -pad.range, pad.range) if(href_list["remove"]) if(usr && alert(usr, "Are you sure?", "Remove Launchpad", "I'm Sure", "Abort") != "Abort") @@ -145,4 +155,4 @@ sending = FALSE teleport(usr, pad) - updateDialog() \ No newline at end of file + updateDialog() diff --git a/code/game/machinery/computer/prisoner/_prisoner.dm b/code/game/machinery/computer/prisoner/_prisoner.dm index d07c351a22..dfadb73ab2 100644 --- a/code/game/machinery/computer/prisoner/_prisoner.dm +++ b/code/game/machinery/computer/prisoner/_prisoner.dm @@ -5,7 +5,7 @@ if(contained_id) contained_id.forceMove(get_turf(src)) return ..() - + /obj/machinery/computer/prisoner/examine(mob/user) . = ..() @@ -15,8 +15,9 @@ /obj/machinery/computer/prisoner/AltClick(mob/user) + ..() id_eject(user) - return ..() + return TRUE /obj/machinery/computer/prisoner/proc/id_insert(mob/user, obj/item/card/id/prisoner/P) if(istype(P)) diff --git a/code/game/machinery/defibrillator_mount.dm b/code/game/machinery/defibrillator_mount.dm index 97cc0f5748..40ccc61b2b 100644 --- a/code/game/machinery/defibrillator_mount.dm +++ b/code/game/machinery/defibrillator_mount.dm @@ -115,8 +115,10 @@ return TRUE /obj/machinery/defibrillator_mount/AltClick(mob/living/carbon/user) + . = ..() if(!istype(user) || !user.canUseTopic(src, BE_CLOSE)) return + . = TRUE if(!defib) to_chat(user, "It'd be hard to remove a defib unit from a mount that has none.") return diff --git a/code/game/machinery/deployable.dm b/code/game/machinery/deployable.dm index b94dbad2de..7614630477 100644 --- a/code/game/machinery/deployable.dm +++ b/code/game/machinery/deployable.dm @@ -153,9 +153,11 @@ . += "Alt-click to toggle modes." /obj/item/grenade/barrier/AltClick(mob/living/carbon/user) + . = ..() if(!istype(user) || !user.canUseTopic(src, BE_CLOSE)) return toggle_mode(user) + return TRUE /obj/item/grenade/barrier/proc/toggle_mode(mob/user) switch(mode) diff --git a/code/game/machinery/dish_drive.dm b/code/game/machinery/dish_drive.dm index 3aad8d874c..7f21d1c1b3 100644 --- a/code/game/machinery/dish_drive.dm +++ b/code/game/machinery/dish_drive.dm @@ -97,8 +97,10 @@ do_the_dishes(TRUE) /obj/machinery/dish_drive/AltClick(mob/living/user) + . = ..() if(user.canUseTopic(src, !issilicon(user))) do_the_dishes(TRUE) + return TRUE /obj/machinery/dish_drive/proc/do_the_dishes(manual) if(!contents.len) diff --git a/code/game/machinery/dna_scanner.dm b/code/game/machinery/dna_scanner.dm index c9e1e7195b..f62dceff6c 100644 --- a/code/game/machinery/dna_scanner.dm +++ b/code/game/machinery/dna_scanner.dm @@ -164,9 +164,11 @@ toggle_open(user) /obj/machinery/dna_scannernew/AltClick(mob/user) + . = ..() if(!user.canUseTopic(src, !issilicon(user))) return interact(user) + return TRUE /obj/machinery/dna_scannernew/MouseDrop_T(mob/target, mob/user) if(user.stat || user.lying || !Adjacent(user) || !user.Adjacent(target) || !iscarbon(target) || !user.IsAdvancedToolUser()) diff --git a/code/game/machinery/doors/passworddoor.dm b/code/game/machinery/doors/passworddoor.dm index fcbb214bb6..2ce2711cb4 100644 --- a/code/game/machinery/doors/passworddoor.dm +++ b/code/game/machinery/doors/passworddoor.dm @@ -22,7 +22,7 @@ if(voice_activated) flags_1 |= HEAR_1 -/obj/machinery/door/password/Hear(message, atom/movable/speaker, message_language, raw_message, radio_freq, list/spans, message_mode) +/obj/machinery/door/password/Hear(message, atom/movable/speaker, message_language, raw_message, radio_freq, list/spans, message_mode, atom/movable/source) . = ..() if(!density || !voice_activated || radio_freq) return diff --git a/code/game/machinery/firealarm.dm b/code/game/machinery/firealarm.dm index 5c2676c2b9..71f39608b5 100644 --- a/code/game/machinery/firealarm.dm +++ b/code/game/machinery/firealarm.dm @@ -58,8 +58,6 @@ /obj/machinery/firealarm/update_icon() cut_overlays() SSvis_overlays.remove_vis_overlay(src, managed_vis_overlays) - var/area/A = src.loc - A = A.loc if(panel_open) icon_state = "fire_b[buildstage]" @@ -69,23 +67,32 @@ icon_state = "firex" return + icon_state = "fire0" + if(stat & NOPOWER) - icon_state = "fire0" return - if(is_station_level(z)) - add_overlay("overlay_[GLOB.security_level]") - SSvis_overlays.add_vis_overlay(src, icon, "overlay_[GLOB.security_level]", ABOVE_LIGHTING_LAYER, ABOVE_LIGHTING_PLANE, dir) - else - add_overlay("overlay_[SEC_LEVEL_GREEN]") - SSvis_overlays.add_vis_overlay(src, icon, "overlay_[SEC_LEVEL_GREEN]", ABOVE_LIGHTING_LAYER, ABOVE_LIGHTING_PLANE, dir) + add_overlay("fire_overlay") - if(detecting) - add_overlay("overlay_[A.fire ? "fire" : "clear"]") - SSvis_overlays.add_vis_overlay(src, icon, "overlay_[A.fire ? "fire" : "clear"]", ABOVE_LIGHTING_LAYER, ABOVE_LIGHTING_PLANE, dir) + if(is_station_level(z)) + add_overlay("fire_[GLOB.security_level]") + SSvis_overlays.add_vis_overlay(src, icon, "fire_[GLOB.security_level]", ABOVE_LIGHTING_LAYER, ABOVE_LIGHTING_PLANE, dir) else - add_overlay("overlay_fire") - SSvis_overlays.add_vis_overlay(src, icon, "overlay_fire", ABOVE_LIGHTING_LAYER, ABOVE_LIGHTING_PLANE, dir) + add_overlay("fire_[SEC_LEVEL_GREEN]") + SSvis_overlays.add_vis_overlay(src, icon, "fire_[SEC_LEVEL_GREEN]", ABOVE_LIGHTING_LAYER, ABOVE_LIGHTING_PLANE, dir) + + var/area/A = src.loc + A = A.loc + + if(!detecting || !A.fire) + add_overlay("fire_off") + SSvis_overlays.add_vis_overlay(src, icon, "fire_off", ABOVE_LIGHTING_LAYER, ABOVE_LIGHTING_PLANE, dir) + else if(obj_flags & EMAGGED) + add_overlay("fire_emagged") + SSvis_overlays.add_vis_overlay(src, icon, "fire_emagged", ABOVE_LIGHTING_LAYER, ABOVE_LIGHTING_PLANE, dir) + else + add_overlay("fire_on") + SSvis_overlays.add_vis_overlay(src, icon, "fire_on", ABOVE_LIGHTING_LAYER, ABOVE_LIGHTING_PLANE, dir) /obj/machinery/firealarm/emp_act(severity) . = ..() @@ -101,6 +108,7 @@ if(obj_flags & EMAGGED) return obj_flags |= EMAGGED + update_icon() if(user) user.visible_message("Sparks fly out of [src]!", "You emag [src], disabling its thermal sensors.") @@ -112,51 +120,39 @@ alarm() ..() -/obj/machinery/firealarm/proc/alarm() - if(!is_operational() && (last_alarm+FIREALARM_COOLDOWN < world.time)) +/obj/machinery/firealarm/proc/alarm(mob/user) + if(!is_operational() || (last_alarm+FIREALARM_COOLDOWN > world.time)) return last_alarm = world.time var/area/A = get_area(src) A.firealert(src) - playsound(src.loc, 'goon/sound/machinery/FireAlarm.ogg', 75) + playsound(loc, 'goon/sound/machinery/FireAlarm.ogg', 75) + if(user) + log_game("[user] triggered a fire alarm at [COORD(src)]") -/obj/machinery/firealarm/proc/reset() +/obj/machinery/firealarm/proc/reset(mob/user) if(!is_operational()) return var/area/A = get_area(src) A.firereset(src) + if(user) + log_game("[user] reset a fire alarm at [COORD(src)]") -/obj/machinery/firealarm/ui_interact(mob/user, ui_key = "main", datum/tgui/ui = null, force_open = FALSE, \ - datum/tgui/master_ui = null, datum/ui_state/state = GLOB.default_state) - ui = SStgui.try_update_ui(user, src, ui_key, ui, force_open) - if(!ui) - ui = new(user, src, ui_key, "firealarm", name, 300, 150, master_ui, state) - ui.open() - -/obj/machinery/firealarm/ui_data(mob/user) - var/list/data = list() - data["emagged"] = obj_flags & EMAGGED ? 1 : 0 - - if(is_station_level(z)) - data["seclevel"] = get_security_level() - else - data["seclevel"] = "green" - +/obj/machinery/firealarm/attack_hand(mob/user) + if(buildstage != 2) + return ..() + add_fingerprint(user) var/area/A = get_area(src) - data["alarm"] = A.fire + if(A.fire) + reset(user) + else + alarm(user) - return data +/obj/machinery/firealarm/attack_ai(mob/user) + return attack_hand(user) -/obj/machinery/firealarm/ui_act(action, params) - if(..() || buildstage != 2) - return - switch(action) - if("reset") - reset() - . = TRUE - if("alarm") - alarm() - . = TRUE +/obj/machinery/firealarm/attack_robot(mob/user) + return attack_hand(user) /obj/machinery/firealarm/attackby(obj/item/W, mob/user, params) add_fingerprint(user) @@ -200,6 +196,12 @@ to_chat(user, "You cut the wires from \the [src].") update_icon() return + else if(W.force) //hit and turn it on + ..() + var/area/A = get_area(src) + if(!A.fire) + alarm() + return if(1) if(istype(W, /obj/item/stack/cable_coil)) var/obj/item/stack/cable_coil/coil = W @@ -322,8 +324,3 @@ if (!party_overlay) party_overlay = iconstate2appearance('icons/turf/areas.dmi', "party") A.add_overlay(party_overlay) - -/obj/machinery/firealarm/partyalarm/ui_data(mob/user) - . = ..() - var/area/A = get_area(src) - .["alarm"] = A && A.party diff --git a/code/game/machinery/harvester.dm b/code/game/machinery/harvester.dm index e6b8fe3b88..e1f9824524 100644 --- a/code/game/machinery/harvester.dm +++ b/code/game/machinery/harvester.dm @@ -51,10 +51,12 @@ open_machine() /obj/machinery/harvester/AltClick(mob/user) + . = ..() if(harvesting || !user || !isliving(user) || state_open) return if(can_harvest()) start_harvest() + return TRUE /obj/machinery/harvester/proc/can_harvest() if(!powered(EQUIP) || state_open || !occupant || !iscarbon(occupant)) diff --git a/code/game/machinery/hologram.dm b/code/game/machinery/hologram.dm index 79aef8ba7b..1e7d720ee9 100644 --- a/code/game/machinery/hologram.dm +++ b/code/game/machinery/hologram.dm @@ -408,7 +408,7 @@ GLOBAL_LIST_EMPTY(network_holopads) /*This is the proc for special two-way communication between AI and holopad/people talking near holopad. For the other part of the code, check silicon say.dm. Particularly robot talk.*/ -/obj/machinery/holopad/Hear(message, atom/movable/speaker, datum/language/message_language, raw_message, radio_freq, list/spans, message_mode) +/obj/machinery/holopad/Hear(message, atom/movable/speaker, datum/language/message_language, raw_message, radio_freq, list/spans, message_mode, atom/movable/source) . = ..() if(speaker && LAZYLEN(masters) && !radio_freq)//Master is mostly a safety in case lag hits or something. Radio_freq so AIs dont hear holopad stuff through radios. for(var/mob/living/silicon/ai/master in masters) @@ -418,7 +418,7 @@ For the other part of the code, check silicon say.dm. Particularly robot talk.*/ for(var/I in holo_calls) var/datum/holocall/HC = I if(HC.connected_holopad == src && speaker != HC.hologram) - HC.user.Hear(message, speaker, message_language, raw_message, radio_freq, spans, message_mode) + HC.user.Hear(message, speaker, message_language, raw_message, radio_freq, spans, message_mode, source) if(outgoing_call && speaker == outgoing_call.user) outgoing_call.hologram.say(raw_message) diff --git a/code/game/machinery/lightswitch.dm b/code/game/machinery/lightswitch.dm index 694df02eb5..2a4b903906 100644 --- a/code/game/machinery/lightswitch.dm +++ b/code/game/machinery/lightswitch.dm @@ -21,9 +21,9 @@ name = "light switch ([area.name])" on = area.lightswitch - updateicon() + update_icon() -/obj/machinery/light_switch/proc/updateicon() +/obj/machinery/light_switch/update_icon() if(stat & NOPOWER) icon_state = "light-p" else @@ -41,11 +41,11 @@ on = !on area.lightswitch = on - area.updateicon() + area.update_icon() for(var/obj/machinery/light_switch/L in area) L.on = on - L.updateicon() + L.update_icon() area.power_change() @@ -57,7 +57,7 @@ else stat |= NOPOWER - updateicon() + update_icon() /obj/machinery/light_switch/emp_act(severity) . = ..() diff --git a/code/game/machinery/magnet.dm b/code/game/machinery/magnet.dm index 094db5a676..370621e0c8 100644 --- a/code/game/machinery/magnet.dm +++ b/code/game/machinery/magnet.dm @@ -46,10 +46,10 @@ // update the invisibility and icon /obj/machinery/magnetic_module/hide(intact) invisibility = intact ? INVISIBILITY_MAXIMUM : 0 - updateicon() + update_icon() // update the icon_state -/obj/machinery/magnetic_module/proc/updateicon() +/obj/machinery/magnetic_module/update_icon() var/state="floor_magnet" var/onstate="" if(!on) @@ -161,7 +161,7 @@ else use_power = NO_POWER_USE - updateicon() + update_icon() /obj/machinery/magnetic_module/proc/magnetic_process() // proc that actually does the magneting diff --git a/code/game/machinery/navbeacon.dm b/code/game/machinery/navbeacon.dm index d64ae75e2c..0f57bea656 100644 --- a/code/game/machinery/navbeacon.dm +++ b/code/game/machinery/navbeacon.dm @@ -72,10 +72,10 @@ // hide the object if turf is intact /obj/machinery/navbeacon/hide(intact) invisibility = intact ? INVISIBILITY_MAXIMUM : 0 - updateicon() + update_icon() // update the icon_state -/obj/machinery/navbeacon/proc/updateicon() +/obj/machinery/navbeacon/update_icon() var/state="navbeacon[open]" if(invisibility) @@ -94,7 +94,7 @@ user.visible_message("[user] [open ? "opens" : "closes"] the beacon's cover.", "You [open ? "open" : "close"] the beacon's cover.") - updateicon() + update_icon() else if (istype(I, /obj/item/card/id)||istype(I, /obj/item/pda)) if(open) diff --git a/code/game/machinery/suit_storage_unit.dm b/code/game/machinery/suit_storage_unit.dm index f35caf514c..adc0e5bf1e 100644 --- a/code/game/machinery/suit_storage_unit.dm +++ b/code/game/machinery/suit_storage_unit.dm @@ -326,6 +326,9 @@ /obj/machinery/suit_storage_unit/attackby(obj/item/I, mob/user, params) if(state_open && is_operational()) + if(istype(I, /obj/item/clothing/head/mob_holder)) + to_chat(user, "You can't quite fit that in while you hold it!") + return if(istype(I, /obj/item/clothing/suit)) if(suit) to_chat(user, "The unit already contains a suit!.") @@ -437,4 +440,4 @@ if(I) I.forceMove(loc) . = TRUE - update_icon() \ No newline at end of file + update_icon() diff --git a/code/game/machinery/washing_machine.dm b/code/game/machinery/washing_machine.dm index 081d91e56f..6990a7a4ba 100644 --- a/code/game/machinery/washing_machine.dm +++ b/code/game/machinery/washing_machine.dm @@ -16,6 +16,7 @@ . += "Alt-click it to start a wash cycle." /obj/machinery/washing_machine/AltClick(mob/user) + . = ..() if(!user.canUseTopic(src)) return @@ -24,11 +25,11 @@ if(state_open) to_chat(user, "Close the door first") - return + return TRUE if(bloody_mess) to_chat(user, "[src] must be cleaned up first.") - return + return TRUE if(has_corgi) bloody_mess = 1 @@ -37,6 +38,7 @@ update_icon() addtimer(CALLBACK(src, .proc/wash_cycle), 200) START_PROCESSING(SSfastprocess, src) + return TRUE /obj/machinery/washing_machine/process() if (!busy) @@ -217,6 +219,10 @@ update_icon() return + if(istype(W, /obj/item/clothing/head/mob_holder)) + to_chat(user, "It's too unwieldly to put in this way.") + return 1 + else if(user.a_intent != INTENT_HARM) if (!state_open) diff --git a/code/game/mecha/combat/gygax.dm b/code/game/mecha/combat/gygax.dm index c7c180af41..0e6980d6b7 100644 --- a/code/game/mecha/combat/gygax.dm +++ b/code/game/mecha/combat/gygax.dm @@ -27,6 +27,7 @@ max_temperature = 35000 leg_overload_coeff = 100 operation_req_access = list(ACCESS_SYNDICATE) + internals_req_access = list(ACCESS_SYNDICATE) wreckage = /obj/structure/mecha_wreckage/gygax/dark max_equip = 4 spawn_tracked = FALSE diff --git a/code/game/mecha/combat/honker.dm b/code/game/mecha/combat/honker.dm index 3a3d98ad1e..ffe318def5 100644 --- a/code/game/mecha/combat/honker.dm +++ b/code/game/mecha/combat/honker.dm @@ -10,6 +10,7 @@ max_temperature = 25000 infra_luminosity = 5 operation_req_access = list(ACCESS_THEATRE) + internals_req_access = list(ACCESS_THEATRE, ACCESS_ROBOTICS) wreckage = /obj/structure/mecha_wreckage/honker add_req_access = 0 max_equip = 3 diff --git a/code/game/mecha/combat/marauder.dm b/code/game/mecha/combat/marauder.dm index 42817b586c..fa9449937b 100644 --- a/code/game/mecha/combat/marauder.dm +++ b/code/game/mecha/combat/marauder.dm @@ -10,6 +10,7 @@ resistance_flags = LAVA_PROOF | FIRE_PROOF | ACID_PROOF infra_luminosity = 3 operation_req_access = list(ACCESS_CENT_SPECOPS) + internals_req_access = list(ACCESS_CENT_SPECOPS, ACCESS_ROBOTICS) wreckage = /obj/structure/mecha_wreckage/marauder add_req_access = 0 internal_damage_threshold = 25 @@ -46,6 +47,7 @@ name = "\improper Seraph" icon_state = "seraph" operation_req_access = list(ACCESS_CENT_SPECOPS) + internals_req_access = list(ACCESS_CENT_SPECOPS, ACCESS_ROBOTICS) step_in = 3 max_integrity = 550 wreckage = /obj/structure/mecha_wreckage/seraph @@ -72,6 +74,7 @@ name = "\improper Mauler" icon_state = "mauler" operation_req_access = list(ACCESS_SYNDICATE) + internals_req_access = list(ACCESS_SYNDICATE) wreckage = /obj/structure/mecha_wreckage/mauler max_equip = 5 diff --git a/code/game/mecha/combat/neovgre.dm b/code/game/mecha/combat/neovgre.dm index b1f2cdd02a..8fc1dd97b2 100644 --- a/code/game/mecha/combat/neovgre.dm +++ b/code/game/mecha/combat/neovgre.dm @@ -12,6 +12,8 @@ layer = ABOVE_MOB_LAYER breach_time = 100 //ten seconds till all goes to shit recharge_rate = 100 + internals_req_access = list() + add_req_access = 0 wreckage = /obj/structure/mecha_wreckage/durand/neovgre spawn_tracked = FALSE @@ -47,7 +49,7 @@ for(var/mob/M in src) to_chat(M, "You are consumed by the fires raging within Neovgre...") M.dust() - playsound(src, 'sound/magic/lightning_chargeup.ogg', 100, 0) + playsound(src, 'sound/effects/neovgre_exploding.ogg', 100, 0) src.visible_message("The reactor has gone critical, its going to blow!") addtimer(CALLBACK(src,.proc/go_critical),breach_time) diff --git a/code/game/mecha/combat/reticence.dm b/code/game/mecha/combat/reticence.dm index 7e8c865517..446e2e853c 100644 --- a/code/game/mecha/combat/reticence.dm +++ b/code/game/mecha/combat/reticence.dm @@ -10,6 +10,7 @@ max_temperature = 15000 wreckage = /obj/structure/mecha_wreckage/reticence operation_req_access = list(ACCESS_THEATRE) + internals_req_access = list(ACCESS_THEATRE, ACCESS_ROBOTICS) add_req_access = 0 internal_damage_threshold = 25 max_equip = 2 diff --git a/code/game/mecha/mecha.dm b/code/game/mecha/mecha.dm index fe0ec33ed6..7e860d9315 100644 --- a/code/game/mecha/mecha.dm +++ b/code/game/mecha/mecha.dm @@ -68,7 +68,7 @@ var/internal_damage = 0 //contains bitflags var/list/operation_req_access = list()//required access level for mecha operation - var/list/internals_req_access = list(ACCESS_ENGINE,ACCESS_ROBOTICS)//REQUIRED ACCESS LEVEL TO OPEN CELL COMPARTMENT + var/list/internals_req_access = list(ACCESS_ROBOTICS)//REQUIRED ACCESS LEVEL TO OPEN CELL COMPARTMENT var/wreckage @@ -409,7 +409,7 @@ /obj/mecha/proc/drop_item()//Derpfix, but may be useful in future for engineering exosuits. return -/obj/mecha/Hear(message, atom/movable/speaker, message_language, raw_message, radio_freq, list/spans, message_mode) +/obj/mecha/Hear(message, atom/movable/speaker, message_language, raw_message, radio_freq, list/spans, message_mode, atom/movable/source) . = ..() if(speaker == occupant) if(radio.broadcasting) diff --git a/code/game/mecha/mecha_actions.dm b/code/game/mecha/mecha_actions.dm index 7b00e208cc..86ec5e70da 100644 --- a/code/game/mecha/mecha_actions.dm +++ b/code/game/mecha/mecha_actions.dm @@ -138,8 +138,10 @@ chassis.toggle_strafe() /obj/mecha/AltClick(mob/living/user) + . = ..() if((user == occupant) && user.canUseTopic(src)) toggle_strafe() + return TRUE /obj/mecha/proc/toggle_strafe() strafe = !strafe diff --git a/code/game/objects/effects/decals/cleanable/misc.dm b/code/game/objects/effects/decals/cleanable/misc.dm index 9f072c48b6..6f92e94759 100644 --- a/code/game/objects/effects/decals/cleanable/misc.dm +++ b/code/game/objects/effects/decals/cleanable/misc.dm @@ -72,6 +72,11 @@ desc = "It's still good. Four second rule!" icon_state = "flour" +/obj/effect/decal/cleanable/greenglow/ecto + name = "ectoplasmic puddle" + desc = "You know who to call." + light_power = 2 + /obj/effect/decal/cleanable/greenglow name = "glowing goo" desc = "Jeez. I hope that's not for lunch." diff --git a/code/game/objects/effects/landmarks.dm b/code/game/objects/effects/landmarks.dm index ed88d51c2d..e01010baa5 100644 --- a/code/game/objects/effects/landmarks.dm +++ b/code/game/objects/effects/landmarks.dm @@ -432,3 +432,52 @@ INITIALIZE_IMMEDIATE(/obj/effect/landmark/start/new_player) GLOB.ruin_landmarks -= src ruin_template = null . = ..() + +//------Station Rooms Landmarks------------// +/obj/effect/landmark/stationroom + var/list/template_names = list() + layer = BULLET_HOLE_LAYER + +/obj/effect/landmark/stationroom/New() + ..() + GLOB.stationroom_landmarks += src + +/obj/effect/landmark/stationroom/Destroy() + if(src in GLOB.stationroom_landmarks) + GLOB.stationroom_landmarks -= src + return ..() + +/obj/effect/landmark/stationroom/proc/load(template_name) + var/turf/T = get_turf(src) + if(!T) + return FALSE + if(!template_name) + for(var/t in template_names) + if(!SSmapping.station_room_templates[t]) + log_world("Station room spawner placed at ([T.x], [T.y], [T.z]) has invalid ruin name of \"[t]\" in its list") + template_names -= t + template_name = safepick(template_names) + if(!template_name) + GLOB.stationroom_landmarks -= src + qdel(src) + return FALSE + var/datum/map_template/template = SSmapping.station_room_templates[template_name] + if(!template) + return FALSE + testing("Room \"[template_name]\" placed at ([T.x], [T.y], [T.z])") + template.load(T, centered = FALSE) + template.loaded++ + GLOB.stationroom_landmarks -= src + qdel(src) + return TRUE + +// The landmark for the Engine on Box + +/obj/effect/landmark/stationroom/box/engine + template_names = list("Engine SM", "Engine Singulo", "Engine Tesla") + icon = 'icons/rooms/box/engine.dmi' + + +/obj/effect/landmark/stationroom/box/engine/New() + . = ..() + template_names = CONFIG_GET(keyed_list/box_random_engine) \ No newline at end of file diff --git a/code/game/objects/effects/spawners/lootdrop.dm b/code/game/objects/effects/spawners/lootdrop.dm index bdb949a570..4540e48ebc 100644 --- a/code/game/objects/effects/spawners/lootdrop.dm +++ b/code/game/objects/effects/spawners/lootdrop.dm @@ -165,7 +165,7 @@ /obj/item/organ/heart/gland/chem = 5, /obj/item/organ/heart/gland/mindshock = 5, /obj/item/organ/heart/gland/plasma = 7, - /obj/item/organ/heart/gland/pop = 5, + /obj/item/organ/heart/gland/transform = 5, /obj/item/organ/heart/gland/slime = 4, /obj/item/organ/heart/gland/spiderman = 5, /obj/item/organ/heart/gland/ventcrawling = 1, diff --git a/code/game/objects/effects/temporary_visuals/miscellaneous.dm b/code/game/objects/effects/temporary_visuals/miscellaneous.dm index 0990486ae3..1b85a41f7c 100644 --- a/code/game/objects/effects/temporary_visuals/miscellaneous.dm +++ b/code/game/objects/effects/temporary_visuals/miscellaneous.dm @@ -349,6 +349,10 @@ icon_state = "impact_laser_purple" duration = 4 +/obj/effect/temp_visual/impact_effect/shrink + icon_state = "m_shield" + duration = 10 + /obj/effect/temp_visual/impact_effect/ion icon_state = "shieldsparkles" duration = 6 @@ -442,3 +446,10 @@ animate(src, alpha = 0, transform = skew, time = duration) else return INITIALIZE_HINT_QDEL + +/obj/effect/temp_visual/slugboom + icon = 'icons/effects/96x96.dmi' + icon_state = "slugboom" + randomdir = FALSE + duration = 30 + pixel_x = -24 \ No newline at end of file diff --git a/code/game/objects/effects/temporary_visuals/projectiles/impact.dm b/code/game/objects/effects/temporary_visuals/projectiles/impact.dm index 875eaf5e60..0360c4ccc2 100644 --- a/code/game/objects/effects/temporary_visuals/projectiles/impact.dm +++ b/code/game/objects/effects/temporary_visuals/projectiles/impact.dm @@ -36,3 +36,7 @@ /obj/effect/projectile/impact/wormhole icon_state = "wormhole_g" + +/obj/effect/projectile/impact/laser/wavemotion + name = "particle impact" + icon_state = "impact_wavemotion" \ No newline at end of file diff --git a/code/game/objects/effects/temporary_visuals/projectiles/muzzle.dm b/code/game/objects/effects/temporary_visuals/projectiles/muzzle.dm index ad6b23f504..cbd4b21d39 100644 --- a/code/game/objects/effects/temporary_visuals/projectiles/muzzle.dm +++ b/code/game/objects/effects/temporary_visuals/projectiles/muzzle.dm @@ -28,3 +28,7 @@ /obj/effect/projectile/muzzle/wormhole icon_state = "wormhole_g" + +/obj/effect/projectile/muzzle/laser/wavemotion + name = "particle backblast" + icon_state = "muzzle_wavemotion" \ No newline at end of file diff --git a/code/game/objects/effects/temporary_visuals/projectiles/tracer.dm b/code/game/objects/effects/temporary_visuals/projectiles/tracer.dm index 23ecf438c4..0cd4589d4c 100644 --- a/code/game/objects/effects/temporary_visuals/projectiles/tracer.dm +++ b/code/game/objects/effects/temporary_visuals/projectiles/tracer.dm @@ -66,3 +66,7 @@ /obj/effect/projectile/tracer/wormhole icon_state = "wormhole_g" + +/obj/effect/projectile/tracer/laser/wavemotion + name = "particle trail" + icon_state = "tracer_wavemotion" diff --git a/code/game/objects/items/RCD.dm b/code/game/objects/items/RCD.dm index 016bfb5e8b..24c241aabc 100644 --- a/code/game/objects/items/RCD.dm +++ b/code/game/objects/items/RCD.dm @@ -133,15 +133,14 @@ RLD if(!(A in range(custom_range, get_turf(user)))) to_chat(user, "The \'Out of Range\' light on [src] blinks red.") return FALSE - else - return TRUE - -/obj/item/construction/proc/prox_check(proximity) - if(proximity) - return TRUE - else + var/view_range = user.client ? user.client.view : world.view + //if user can't be seen from A (only checks surroundings' opaqueness) and can't see A. + //jarring, but it should stop people from targetting atoms they can't see... + //excluding darkness, to allow RLD to be used to light pitch black dark areas. + if(!((user in view(view_range, A)) || (user in viewers(view_range, A)))) + to_chat(user, "You focus, pointing \the [src] at whatever outside your field of vision in the given direction... to no avail.") return FALSE - + return TRUE /obj/item/construction/rcd name = "rapid-construction-device (RCD)" @@ -523,7 +522,12 @@ RLD /obj/item/construction/rcd/afterattack(atom/A, mob/user, proximity) . = ..() - if(!prox_check(proximity)) + if(!proximity) + if(!ranged || !range_check(A,user)) //early return not-in-range sanity. + return + if(target_check(A,user)) + user.Beam(A,icon_state="rped_upgrade",time=30) + rcd_create(A,user) return rcd_create(A, user) @@ -635,6 +639,7 @@ RLD max_matter = INFINITY matter = INFINITY upgrade = TRUE + ranged = TRUE // Ranged RCD @@ -650,20 +655,10 @@ RLD item_state = "oldrcd" has_ammobar = FALSE -/obj/item/construction/rcd/arcd/afterattack(atom/A, mob/user) - . = ..() - if(!range_check(A,user)) - return - if(target_check(A,user)) - user.Beam(A,icon_state="rped_upgrade",time=30) - rcd_create(A,user) - - // RAPID LIGHTING DEVICE - /obj/item/construction/rld name = "rapid-light-device (RLD)" desc = "A device used to rapidly provide lighting sources to an area. Reload with metal, plasteel, glass or compressed matter cartridges." diff --git a/code/game/objects/items/cards_ids.dm b/code/game/objects/items/cards_ids.dm index 97f5989eb4..fef0c55f5e 100644 --- a/code/game/objects/items/cards_ids.dm +++ b/code/game/objects/items/cards_ids.dm @@ -517,16 +517,17 @@ update_label("John Doe", "Clowny") return if(user.incapacitated() || !istype(user)) to_chat(user, "You can't do that right now!") - return + return TRUE if(alert("Are you sure you want to recolor your id?", "Confirm Repaint", "Yes", "No") == "Yes") var/energy_color_input = input(usr,"","Choose Energy Color",id_color) as color|null if(!in_range(src, user) || !energy_color_input) - return + return TRUE if(user.incapacitated() || !istype(user)) to_chat(user, "You can't do that right now!") - return + return TRUE id_color = sanitize_hexcolor(energy_color_input, desired_format=6, include_crunch=1) update_icon() + return TRUE /obj/item/card/id/knight/Initialize() . = ..() diff --git a/code/game/objects/items/circuitboards/machine_circuitboards.dm b/code/game/objects/items/circuitboards/machine_circuitboards.dm index ccd96525a3..10a2b2c807 100644 --- a/code/game/objects/items/circuitboards/machine_circuitboards.dm +++ b/code/game/objects/items/circuitboards/machine_circuitboards.dm @@ -665,6 +665,13 @@ name = "Booze Dispenser (Machine Board)" build_path = /obj/machinery/chem_dispenser/drinks/beer +/obj/item/circuitboard/machine/chem_dispenser/abductor + name = "Reagent Synthetizer (Abductor Machine Board)" + icon_state = "abductor_mod" + build_path = /obj/machinery/chem_dispenser/abductor + def_components = list(/obj/item/stock_parts/cell = /obj/item/stock_parts/cell/high) + needs_anchored = FALSE + /obj/item/circuitboard/machine/smoke_machine name = "Smoke Machine (Machine Board)" build_path = /obj/machinery/smoke_machine @@ -945,10 +952,12 @@ to_chat(user, "You [suction ? "enable" : "disable"] the board's suction function.") /obj/item/circuitboard/machine/dish_drive/AltClick(mob/living/user) + . = ..() if(!user.Adjacent(src)) return transmit = !transmit to_chat(user, "You [transmit ? "enable" : "disable"] the board's automatic disposal transmission.") + return TRUE /obj/item/circuitboard/machine/stacking_unit_console name = "Stacking Machine Console (Machine Board)" diff --git a/code/game/objects/items/crayons.dm b/code/game/objects/items/crayons.dm index 2a7b5d24cd..41ab418cf2 100644 --- a/code/game/objects/items/crayons.dm +++ b/code/game/objects/items/crayons.dm @@ -150,11 +150,13 @@ ui.open() /obj/item/toy/crayon/spraycan/AltClick(mob/user) + . = ..() if(user.canUseTopic(src, BE_CLOSE, ismonkey(user))) if(has_cap) is_capped = !is_capped to_chat(user, "The cap on [src] is now [is_capped ? "on" : "off"].") update_icon() + return TRUE /obj/item/toy/crayon/proc/staticDrawables() diff --git a/code/game/objects/items/defib.dm b/code/game/objects/items/defib.dm index 63c9df9c4e..702347c220 100644 --- a/code/game/objects/items/defib.dm +++ b/code/game/objects/items/defib.dm @@ -27,6 +27,8 @@ var/pullshocksafely = FALSE //Dose the unit have the healdisk upgrade? var/primetime = 0 // is the defib faster var/timedeath = 10 + var/disarm_shock_time = 10 + var/always_emagged = FALSE /obj/item/defibrillator/get_cell() return cell @@ -140,6 +142,7 @@ /obj/item/defibrillator/emag_act(mob/user) . = ..() + always_emagged = TRUE safety = !safety to_chat(user, "You silently [safety ? "enable" : "disable"] [src]'s safety protocols with the cryptographic sequencer.") return TRUE @@ -154,7 +157,7 @@ safety = FALSE visible_message("[src] beeps: Safety protocols disabled!") playsound(src, 'sound/machines/defib_saftyOff.ogg', 50, 0) - else + else if(!always_emagged) safety = TRUE visible_message("[src] beeps: Safety protocols enabled!") playsound(src, 'sound/machines/defib_saftyOn.ogg', 50, 0) @@ -257,6 +260,8 @@ desc = "A belt-equipped blood-red defibrillator that can be rapidly deployed. Does not have the restrictions or safeties of conventional defibrillators and can revive through space suits." combat = TRUE safety = FALSE + always_emagged = TRUE + disarm_shock_time = 0 /obj/item/defibrillator/compact/combat/loaded/Initialize() . = ..() @@ -293,6 +298,7 @@ var/combat = FALSE //If it penetrates armor and gives additional functionality var/grab_ghost = FALSE var/tlimit = DEFIB_TIME_LIMIT * 10 + var/disarm_shock_time = 10 var/mob/listeningTo @@ -467,7 +473,7 @@ M.visible_message("[user] hastily places [src] on [M]'s chest!", \ "[user] hastily places [src] on [M]'s chest!") busy = TRUE - if(do_after(user, 10, target = M)) + if(do_after(user, isnull(defib?.disarm_shock_time)? disarm_shock_time : defib.disarm_shock_time, target = M)) M.visible_message("[user] zaps [M] with [src]!", \ "[user] zaps [M] with [src]!") M.adjustStaminaLoss(50) @@ -734,9 +740,8 @@ /obj/item/disk/medical name = "Defibrillator Upgrade Disk" desc = "A blank upgrade disk, made for a defibrillator" - icon = 'modular_citadel/icons/obj/defib_disks.dmi' - icon_state = "upgrade_disk" - item_state = "heal_disk" + icon_state = "heal_disk" + item_state = "defib_disk" w_class = WEIGHT_CLASS_SMALL /obj/item/disk/medical/defib_heal diff --git a/code/game/objects/items/devices/PDA/PDA.dm b/code/game/objects/items/devices/PDA/PDA.dm index 836caeaf04..d97c07bf87 100644 --- a/code/game/objects/items/devices/PDA/PDA.dm +++ b/code/game/objects/items/devices/PDA/PDA.dm @@ -828,14 +828,14 @@ GLOBAL_LIST_EMPTY(PDAs) send_message(U,list(P)) /obj/item/pda/AltClick() - ..() - + . = ..() if(id) remove_id() playsound(src, 'sound/machines/terminal_eject_disc.ogg', 50, 1) else remove_pen() playsound(src, 'sound/machines/button4.ogg', 50, 1) + return TRUE /obj/item/pda/CtrlClick() ..() diff --git a/code/game/objects/items/devices/desynchronizer.dm b/code/game/objects/items/devices/desynchronizer.dm index 4a6e2d5a46..ff58af2405 100644 --- a/code/game/objects/items/devices/desynchronizer.dm +++ b/code/game/objects/items/devices/desynchronizer.dm @@ -32,6 +32,7 @@ . += "Can be used again to interrupt the effect early. The recharge time is the same as the time spent in desync." /obj/item/desynchronizer/AltClick(mob/living/user) + . = ..() if(!istype(user) || !user.canUseTopic(src, BE_CLOSE, ismonkey(user))) return var/new_duration = input(user, "Set the duration (5-300):", "Desynchronizer", duration / 10) as null|num @@ -40,6 +41,7 @@ new_duration = CLAMP(new_duration, 50, max_duration) duration = new_duration to_chat(user, "You set the duration to [DisplayTimeText(duration)].") + return TRUE /obj/item/desynchronizer/proc/desync(mob/living/user) if(sync_holder) diff --git a/code/game/objects/items/devices/dogborg_sleeper.dm b/code/game/objects/items/devices/dogborg_sleeper.dm index 1a3bc283d9..9b4842b291 100644 --- a/code/game/objects/items/devices/dogborg_sleeper.dm +++ b/code/game/objects/items/devices/dogborg_sleeper.dm @@ -153,6 +153,7 @@ playsound(loc, voracious ? 'sound/effects/splat.ogg' : 'sound/effects/bin_close.ogg', 50, 1) items_preserved.Cut() cleaning = FALSE + patient = null if(hound) update_gut(hound) @@ -525,5 +526,5 @@ playsound(hound, 'sound/effects/bin_close.ogg', 80, 1) /obj/item/dogborg/sleeper/K9/flavour - name = "Mobile Sleeper" + name = "Recreational Sleeper" desc = "A mounted, underslung sleeper, intended for holding willing occupants for leisurely purposes." \ No newline at end of file diff --git a/code/game/objects/items/devices/geiger_counter.dm b/code/game/objects/items/devices/geiger_counter.dm index e6044ceadf..ce0e492393 100644 --- a/code/game/objects/items/devices/geiger_counter.dm +++ b/code/game/objects/items/devices/geiger_counter.dm @@ -182,14 +182,16 @@ return ..() /obj/item/geiger_counter/AltClick(mob/living/user) + . = ..() if(!istype(user) || !user.canUseTopic(src, BE_CLOSE)) - return ..() + return if(!scanning) to_chat(usr, "[src] must be on to reset its radiation level!") - return 0 + return TRUE radiation_count = 0 to_chat(usr, "You flush [src]'s radiation counts, resetting it to normal.") update_icon() + return TRUE /obj/item/geiger_counter/emag_act(mob/user) . = ..() diff --git a/code/game/objects/items/devices/gps.dm b/code/game/objects/items/devices/gps.dm index 2368cdc4f0..acdb546a34 100644 --- a/code/game/objects/items/devices/gps.dm +++ b/code/game/objects/items/devices/gps.dm @@ -45,9 +45,11 @@ GLOBAL_LIST_EMPTY(GPS_list) add_overlay("working") /obj/item/gps/AltClick(mob/user) + . = ..() if(!user.canUseTopic(src, BE_CLOSE)) return toggletracking(user) + return TRUE /obj/item/gps/proc/toggletracking(mob/user) if(!user.canUseTopic(src, BE_CLOSE)) diff --git a/code/game/objects/items/devices/laserpointer.dm b/code/game/objects/items/devices/laserpointer.dm index 7baea7f488..1654ecde41 100644 --- a/code/game/objects/items/devices/laserpointer.dm +++ b/code/game/objects/items/devices/laserpointer.dm @@ -69,14 +69,9 @@ if (!user.IsAdvancedToolUser()) to_chat(user, "You don't have the dexterity to do this!") return - if(HAS_TRAIT(user, TRAIT_NOGUNS)) + if(HAS_TRAIT(user, TRAIT_CHUNKYFINGERS)) to_chat(user, "Your fingers can't press the button!") return - if(ishuman(user)) - var/mob/living/carbon/human/H = user - if(H.dna.check_mutation(HULK)) - to_chat(user, "Your fingers can't press the button!") - return add_fingerprint(user) diff --git a/code/game/objects/items/devices/quantum_keycard.dm b/code/game/objects/items/devices/quantum_keycard.dm index fc9ccddaf9..33f839fa39 100644 --- a/code/game/objects/items/devices/quantum_keycard.dm +++ b/code/game/objects/items/devices/quantum_keycard.dm @@ -18,12 +18,14 @@ . += "Insert [src] into an active quantum pad to link it." /obj/item/quantum_keycard/AltClick(mob/living/user) + . = ..() if(!istype(user) || !user.canUseTopic(src, BE_CLOSE, ismonkey(user))) return to_chat(user, "You start pressing [src]'s unlink button...") if(do_after(user, 40, target = src)) to_chat(user, "The keycard beeps twice and disconnects the quantum link.") qpad = null + return TRUE /obj/item/quantum_keycard/update_icon() if(qpad) diff --git a/code/game/objects/items/devices/radio/headset.dm b/code/game/objects/items/devices/radio/headset.dm index 9f371f1ddb..413ef98060 100644 --- a/code/game/objects/items/devices/radio/headset.dm +++ b/code/game/objects/items/devices/radio/headset.dm @@ -230,6 +230,14 @@ GLOBAL_LIST_INIT(channel_tokens, list( icon_state = "srv_headset" keyslot = new /obj/item/encryptionkey/headset_service +/obj/item/radio/headset/headset_clown + name = "clown's headset" + desc = "A headset for the clown. Finally. A megaphone you can't take away." + icon_state = "srv_headset" + keyslot = new /obj/item/encryptionkey/headset_service + command = TRUE + commandspan = SPAN_CLOWN + /obj/item/radio/headset/headset_cent name = "\improper CentCom headset" desc = "A headset used by the upper echelons of Nanotrasen." @@ -326,8 +334,10 @@ GLOBAL_LIST_INIT(channel_tokens, list( secure_radio_connections[ch_name] = add_radio(src, GLOB.radiochannels[ch_name]) /obj/item/radio/headset/AltClick(mob/living/user) + . = ..() if(!istype(user) || !Adjacent(user) || user.incapacitated()) return if (command) use_command = !use_command to_chat(user, "You toggle high-volume mode [use_command ? "on" : "off"].") + return TRUE diff --git a/code/game/objects/items/devices/radio/intercom.dm b/code/game/objects/items/devices/radio/intercom.dm index c8118e615f..efdf055743 100644 --- a/code/game/objects/items/devices/radio/intercom.dm +++ b/code/game/objects/items/devices/radio/intercom.dm @@ -113,7 +113,7 @@ return TRUE -/obj/item/radio/intercom/Hear(message, atom/movable/speaker, message_langs, raw_message, radio_freq, list/spans, message_mode) +/obj/item/radio/intercom/Hear(message, atom/movable/speaker, message_langs, raw_message, radio_freq, list/spans, message_mode, atom/movable/source) . = ..() if (message_mode == MODE_INTERCOM) return // Avoid hearing the same thing twice diff --git a/code/game/objects/items/devices/radio/radio.dm b/code/game/objects/items/devices/radio/radio.dm index 55858e217a..22012a114f 100644 --- a/code/game/objects/items/devices/radio/radio.dm +++ b/code/game/objects/items/devices/radio/radio.dm @@ -29,6 +29,7 @@ var/freqlock = FALSE // Frequency lock to stop the user from untuning specialist radios. var/use_command = FALSE // If true, broadcasts will be large and BOLD. var/command = FALSE // If true, use_command can be toggled at will. + var/commandspan = SPAN_COMMAND //allow us to set what the fuck we want for headsets // Encryption key handling var/obj/item/encryptionkey/keyslot @@ -206,7 +207,7 @@ return if(use_command) - spans |= SPAN_COMMAND + spans |= commandspan /* Roughly speaking, radios attempt to make a subspace transmission (which @@ -274,7 +275,7 @@ signal.levels = list(T.z) signal.broadcast() -/obj/item/radio/Hear(message, atom/movable/speaker, message_language, raw_message, radio_freq, list/spans, message_mode) +/obj/item/radio/Hear(message, atom/movable/speaker, message_language, raw_message, radio_freq, list/spans, message_mode, atom/movable/source) . = ..() if(radio_freq || !broadcasting || get_dist(src, speaker) > canhear_range) return diff --git a/code/game/objects/items/devices/scanners.dm b/code/game/objects/items/devices/scanners.dm index d1e0f4841d..00381b9838 100644 --- a/code/game/objects/items/devices/scanners.dm +++ b/code/game/objects/items/devices/scanners.dm @@ -412,7 +412,7 @@ SLIME SCANNER if(ishuman(C)) if(H.bleed_rate) msg += "Subject is bleeding!\n" - var/blood_percent = round((C.blood_volume / (BLOOD_VOLUME_NORMAL * C.blood_ratio))*100) + var/blood_percent = round((C.scan_blood_volume() / (BLOOD_VOLUME_NORMAL * C.blood_ratio))*100) var/blood_type = C.dna.blood_type if(blood_id != ("blood" || "jellyblood"))//special blood substance var/datum/reagent/R = GLOB.chemical_reagents_list[blood_id] @@ -420,12 +420,12 @@ SLIME SCANNER blood_type = R.name else blood_type = blood_id - if(C.blood_volume <= (BLOOD_VOLUME_SAFE*C.blood_ratio) && C.blood_volume > (BLOOD_VOLUME_OKAY*C.blood_ratio)) - msg += "LOW blood level [blood_percent] %, [C.blood_volume] cl, type: [blood_type]\n" - else if(C.blood_volume <= (BLOOD_VOLUME_OKAY*C.blood_ratio)) - msg += "CRITICAL blood level [blood_percent] %, [C.blood_volume] cl, type: [blood_type]\n" + if(C.scan_blood_volume() <= (BLOOD_VOLUME_SAFE*C.blood_ratio) && C.scan_blood_volume() > (BLOOD_VOLUME_OKAY*C.blood_ratio)) + msg += "LOW blood level [blood_percent] %, [C.scan_blood_volume()] cl, type: [blood_type]\n" + else if(C.scan_blood_volume() <= (BLOOD_VOLUME_OKAY*C.blood_ratio)) + msg += "CRITICAL blood level [blood_percent] %, [C.scan_blood_volume()] cl, type: [blood_type]\n" else - msg += "Blood level [blood_percent] %, [C.blood_volume] cl, type: [blood_type]\n" + msg += "Blood level [blood_percent] %, [C.scan_blood_volume()] cl, type: [blood_type]\n" var/cyberimp_detect for(var/obj/item/organ/cyberimp/CI in C.internal_organs) @@ -590,10 +590,10 @@ SLIME SCANNER to_chat(user, "Temperature: [round(environment.temperature-T0C, 0.01)] °C ([round(environment.temperature, 0.01)] K)") /obj/item/analyzer/AltClick(mob/user) //Barometer output for measuring when the next storm happens - ..() + . = ..() if(user.canUseTopic(src)) - + . = TRUE if(cooldown) to_chat(user, "[src]'s barometer function is preparing itself.") return diff --git a/code/game/objects/items/devices/taperecorder.dm b/code/game/objects/items/devices/taperecorder.dm index 5a9a2027a0..a884524e11 100644 --- a/code/game/objects/items/devices/taperecorder.dm +++ b/code/game/objects/items/devices/taperecorder.dm @@ -94,7 +94,7 @@ icon_state = "taperecorder_idle" -/obj/item/taperecorder/Hear(message, atom/movable/speaker, message_langs, raw_message, radio_freq, spans, message_mode) +/obj/item/taperecorder/Hear(message, atom/movable/speaker, message_langs, raw_message, radio_freq, spans, message_mode, atom/movable/source) . = ..() if(mytape && recording) mytape.timestamp += mytape.used_capacity diff --git a/code/game/objects/items/eightball.dm b/code/game/objects/items/eightball.dm index 9dc3e421fd..b37c147357 100644 --- a/code/game/objects/items/eightball.dm +++ b/code/game/objects/items/eightball.dm @@ -122,7 +122,7 @@ interact(user) return ..() -/obj/item/toy/eightball/haunted/Hear(message, atom/movable/speaker, message_langs, raw_message, radio_freq, spans, message_mode) +/obj/item/toy/eightball/haunted/Hear(message, atom/movable/speaker, message_langs, raw_message, radio_freq, spans, message_mode, atom/movable/source) . = ..() last_message = raw_message diff --git a/code/game/objects/items/flamethrower.dm b/code/game/objects/items/flamethrower.dm index d9525ab931..906572d018 100644 --- a/code/game/objects/items/flamethrower.dm +++ b/code/game/objects/items/flamethrower.dm @@ -138,11 +138,13 @@ toggle_igniter(user) /obj/item/flamethrower/AltClick(mob/user) + . = ..() if(ptank && isliving(user) && user.canUseTopic(src, BE_CLOSE, ismonkey(user))) user.put_in_hands(ptank) ptank = null to_chat(user, "You remove the plasma tank from [src]!") update_icon() + return TRUE /obj/item/flamethrower/examine(mob/user) . = ..() diff --git a/code/game/objects/items/gift.dm b/code/game/objects/items/gift.dm index f97b3f99d6..8054d8c6a4 100644 --- a/code/game/objects/items/gift.dm +++ b/code/game/objects/items/gift.dm @@ -76,7 +76,7 @@ GLOBAL_LIST_EMPTY(possible_gifts) /obj/item/clothing/suit/poncho/red, /obj/item/clothing/suit/snowman, /obj/item/clothing/head/snowman, - /obj/item/trash/coal) + /obj/item/stack/sheet/mineral/coal) gift_type_list += subtypesof(/obj/item/clothing/head/collectable) gift_type_list += subtypesof(/obj/item/toy) - (((typesof(/obj/item/toy/cards) - /obj/item/toy/cards/deck) + /obj/item/toy/figure + /obj/item/toy/ammo)) //All toys, except for abstract types and syndicate cards. diff --git a/code/game/objects/items/granters.dm b/code/game/objects/items/granters.dm index 6ea68bf548..70cd503ef4 100644 --- a/code/game/objects/items/granters.dm +++ b/code/game/objects/items/granters.dm @@ -183,6 +183,23 @@ explosion(user.loc, 1, 0, 2, 3, FALSE, FALSE, 2) qdel(src) +/obj/item/book/granter/spell/nuclearfist + spell = /obj/effect/proc_holder/spell/targeted/touch/nuclear_fist + spellname = "nuclear fist" + icon_state ="booknuclearfist" + desc = "This book radiates confidence." + remarks = list("Line them up....", ".. knock em' down...", "Dress in yellow for maximum effect... why?", "The energy comes from spinach... huh", "Work out for three years? No way!", "Oh I'll cast you a spell allright...", "What ho mighty wizard... ho ho ho...") + +/obj/item/book/granter/spell/nuclearfist/recoil(mob/living/carbon/user) + ..() + to_chat(user, "Your arm spontaneously detonates!") + explosion(user.loc, -1, 0, 2, -1, FALSE, FALSE, 2) + var/obj/item/bodypart/part = user.get_holding_bodypart_of_item(src) + if(part) + part.dismember() + qdel(part) + + /obj/item/book/granter/spell/sacredflame spell = /obj/effect/proc_holder/spell/targeted/sacred_flame spellname = "sacred flame" @@ -397,6 +414,23 @@ name = "empty scroll" icon_state = "blankscroll" +/obj/item/book/granter/martial/bass + martial = /datum/martial_art/the_rising_bass + name = "shifting scroll" + martialname = "rising bass" + desc = "A paper scroll that seems to move even as you read it, the letters never seem to stay still." + greet = "You have learned the ancient martial art of the Rising Bass. Your skill at running away has increased quite a bit. Use the combos to get away from opponents quickly. Along with this, you now dodge all projectiles and catch anything thrown at you." + icon = 'icons/obj/wizard.dmi' + icon_state = "scroll2" + remarks = list("The trick is to disarm them...","Running away helps in many situations...","Never stay still...","Fighting won't help unless you're forced to...", "Crush their limbs to incapacitate them...", "Stay as far away as possible...") + +/obj/item/book/granter/martial/bass/onlearned(mob/living/carbon/user) + ..() + if(oneuse == TRUE) + desc = "It's completely blank." + name = "empty scroll" + icon_state = "blankscroll" + /obj/item/book/granter/martial/plasma_fist martial = /datum/martial_art/plasma_fist name = "frayed scroll" diff --git a/code/game/objects/items/grenades/flashbang.dm b/code/game/objects/items/grenades/flashbang.dm index 48ecf8273a..66897fa722 100644 --- a/code/game/objects/items/grenades/flashbang.dm +++ b/code/game/objects/items/grenades/flashbang.dm @@ -14,23 +14,31 @@ do_sparks(rand(5, 9), FALSE, src) playsound(flashbang_turf, 'sound/weapons/flashbang.ogg', 100, TRUE, 8, 0.9) new /obj/effect/dummy/lighting_obj (flashbang_turf, LIGHT_COLOR_WHITE, (flashbang_range + 2), 4, 2) - for(var/mob/living/M in get_hearers_in_view(flashbang_range, flashbang_turf)) - bang(get_turf(M), M) + flashbang_mobs(flashbang_turf, flashbang_range) qdel(src) -/obj/item/grenade/flashbang/proc/bang(turf/T , mob/living/M) +/obj/item/grenade/flashbang/proc/flashbang_mobs(turf/source, range) + var/list/banged = get_hearers_in_view(range, source) + var/list/flashed = viewers(range, source) + for(var/i in banged) + bang(i, source) + for(var/i in flashed) + flash(i, source) + +/obj/item/grenade/flashbang/proc/bang(mob/living/M, turf/source) if(M.stat == DEAD) //They're dead! return M.show_message("BANG", MSG_AUDIBLE) - var/distance = max(0,get_dist(get_turf(src),T)) - -//Flash - if(M.flash_act(affect_silicon = 1)) - M.Knockdown(max(200/max(1,distance), 60)) -//Bang + var/distance = get_dist(get_turf(M), source) if(!distance || loc == M || loc == M.loc) //Stop allahu akbarring rooms with this. M.Knockdown(200) M.soundbang_act(1, 200, 10, 15) - else M.soundbang_act(1, max(200/max(1,distance), 60), rand(0, 5)) + +/obj/item/grenade/flashbang/proc/flash(mob/living/M, turf/source) + if(M.stat == DEAD) //They're dead! + return + var/distance = get_dist(get_turf(M), source) + if(M.flash_act(affect_silicon = 1)) + M.Knockdown(max(200/max(1,distance), 60)) diff --git a/code/game/objects/items/implants/implant_mindshield.dm b/code/game/objects/items/implants/implant_mindshield.dm index 2a99c6e1ec..52f9f3b9a4 100644 --- a/code/game/objects/items/implants/implant_mindshield.dm +++ b/code/game/objects/items/implants/implant_mindshield.dm @@ -26,6 +26,9 @@ if(target.mind.has_antag_datum(/datum/antagonist/brainwashed)) target.mind.remove_antag_datum(/datum/antagonist/brainwashed) + if(target.mind.has_antag_datum(ANTAG_DATUM_VASSAL)) + SSticker.mode.remove_vassal(target.mind) + if(target.mind.has_antag_datum(/datum/antagonist/rev/head) || target.mind.unconvertable || target.mind.has_antag_datum(/datum/antagonist/gang/boss)) if(!silent) target.visible_message("[target] seems to resist the implant!", "You feel something interfering with your mental conditioning, but you resist it!") diff --git a/code/game/objects/items/melee/energy.dm b/code/game/objects/items/melee/energy.dm index 561af8ded6..16262d61c3 100644 --- a/code/game/objects/items/melee/energy.dm +++ b/code/game/objects/items/melee/energy.dm @@ -320,11 +320,12 @@ M.update_inv_hands() /obj/item/melee/transforming/energy/sword/cx/AltClick(mob/living/user) + . = ..() if(!in_range(src, user)) //Basic checks to prevent abuse return if(user.incapacitated() || !istype(user)) to_chat(user, "You can't do that right now!") - return + return TRUE if(alert("Are you sure you want to recolor your blade?", "Confirm Repaint", "Yes", "No") == "Yes") var/energy_color_input = input(usr,"","Choose Energy Color",light_color) as color|null @@ -332,6 +333,7 @@ light_color = sanitize_hexcolor(energy_color_input, desired_format=6, include_crunch=1) update_icon() update_light() + return TRUE /obj/item/melee/transforming/energy/sword/cx/examine(mob/user) . = ..() diff --git a/code/game/objects/items/melee/misc.dm b/code/game/objects/items/melee/misc.dm index d7c2f7f4f6..d8abff70a6 100644 --- a/code/game/objects/items/melee/misc.dm +++ b/code/game/objects/items/melee/misc.dm @@ -79,17 +79,17 @@ final_block_chance = 0 //Don't bring a sword to a gunfight return ..() -/obj/item/melee/sabre/on_exit_storage(obj/item/storage/S) - ..() - var/obj/item/storage/belt/sabre/B = S +/obj/item/melee/sabre/on_exit_storage(datum/component/storage/S) + var/obj/item/storage/belt/sabre/B = S.parent if(istype(B)) playsound(B, 'sound/items/unsheath.ogg', 25, 1) - -/obj/item/melee/sabre/on_enter_storage(obj/item/storage/S) ..() - var/obj/item/storage/belt/sabre/B = S + +/obj/item/melee/sabre/on_enter_storage(datum/component/storage/S) + var/obj/item/storage/belt/sabre/B = S.parent if(istype(B)) playsound(B, 'sound/items/sheath.ogg', 25, 1) + ..() /obj/item/melee/sabre/get_belt_overlay() return mutable_appearance('icons/obj/clothing/belt_overlays.dmi', "sabre") diff --git a/code/game/objects/items/pet_carrier.dm b/code/game/objects/items/pet_carrier.dm index b107010991..5af9c70d9b 100644 --- a/code/game/objects/items/pet_carrier.dm +++ b/code/game/objects/items/pet_carrier.dm @@ -70,6 +70,7 @@ update_icon() /obj/item/pet_carrier/AltClick(mob/living/user) + . = ..() if(open || !user.canUseTopic(src, BE_CLOSE)) return locked = !locked @@ -79,6 +80,7 @@ else playsound(user, 'sound/machines/boltsup.ogg', 30, TRUE) update_icon() + return TRUE /obj/item/pet_carrier/attack(mob/living/target, mob/living/user) if(user.a_intent == INTENT_HARM) diff --git a/code/game/objects/items/pneumaticCannon.dm b/code/game/objects/items/pneumaticCannon.dm index 72d27ae544..e63b4d7a3a 100644 --- a/code/game/objects/items/pneumaticCannon.dm +++ b/code/game/objects/items/pneumaticCannon.dm @@ -213,7 +213,7 @@ loadedWeightClass -= I.w_class else if (A == tank) tank = null - update_icons() + update_icon() /obj/item/pneumatic_cannon/ghetto //Obtainable by improvised methods; more gas per use, less capacity, but smaller name = "improvised pneumatic cannon" @@ -239,14 +239,13 @@ return to_chat(user, "You hook \the [thetank] up to \the [src].") tank = thetank - update_icons() + update_icon() -/obj/item/pneumatic_cannon/proc/update_icons() +/obj/item/pneumatic_cannon/update_icon() cut_overlays() if(!tank) return add_overlay(tank.icon_state) - update_icon() /obj/item/pneumatic_cannon/proc/fill_with_type(type, amount) if(!ispath(type, /obj) && !ispath(type, /mob)) diff --git a/code/game/objects/items/robot/robot_parts.dm b/code/game/objects/items/robot/robot_parts.dm index 95110692c9..ab8030c9c2 100644 --- a/code/game/objects/items/robot/robot_parts.dm +++ b/code/game/objects/items/robot/robot_parts.dm @@ -24,7 +24,7 @@ /obj/item/robot_suit/New() ..() - updateicon() + update_icon() /obj/item/robot_suit/prebuilt/New() l_arm = new(src) @@ -39,7 +39,7 @@ chest.cell = new /obj/item/stock_parts/cell/high/plus(chest) ..() -/obj/item/robot_suit/proc/updateicon() +/obj/item/robot_suit/update_icon() cut_overlays() if(l_arm) add_overlay("[l_arm.icon_state]+o") @@ -96,7 +96,7 @@ to_chat(user, "You disassemble the cyborg shell.") else to_chat(user, "There is nothing to remove from the endoskeleton.") - updateicon() + update_icon() /obj/item/robot_suit/proc/put_in_hand_or_drop(mob/living/user, obj/item/I) //normal put_in_hands() drops the item ontop of the player, this drops it at the suit's loc if(!user.put_in_hands(I)) @@ -160,7 +160,7 @@ W.icon_state = initial(W.icon_state) W.cut_overlays() src.l_leg = W - src.updateicon() + update_icon() else if(istype(W, /obj/item/bodypart/r_leg/robot)) if(src.r_leg) @@ -170,7 +170,7 @@ W.icon_state = initial(W.icon_state) W.cut_overlays() src.r_leg = W - src.updateicon() + update_icon() else if(istype(W, /obj/item/bodypart/l_arm/robot)) if(src.l_arm) @@ -180,7 +180,7 @@ W.icon_state = initial(W.icon_state) W.cut_overlays() src.l_arm = W - src.updateicon() + update_icon() else if(istype(W, /obj/item/bodypart/r_arm/robot)) if(src.r_arm) @@ -190,7 +190,7 @@ W.icon_state = initial(W.icon_state)//in case it is a dismembered robotic limb W.cut_overlays() src.r_arm = W - src.updateicon() + update_icon() else if(istype(W, /obj/item/bodypart/chest/robot)) var/obj/item/bodypart/chest/robot/CH = W @@ -202,7 +202,7 @@ CH.icon_state = initial(CH.icon_state) //in case it is a dismembered robotic limb CH.cut_overlays() src.chest = CH - src.updateicon() + update_icon() else if(!CH.wired) to_chat(user, "You need to attach wires to it first!") else @@ -222,7 +222,7 @@ HD.icon_state = initial(HD.icon_state)//in case it is a dismembered robotic limb HD.cut_overlays() src.head = HD - src.updateicon() + update_icon() else to_chat(user, "You need to attach a flash to it first!") diff --git a/code/game/objects/items/robot/robot_upgrades.dm b/code/game/objects/items/robot/robot_upgrades.dm index a0b78d8b27..bf363f959c 100644 --- a/code/game/objects/items/robot/robot_upgrades.dm +++ b/code/game/objects/items/robot/robot_upgrades.dm @@ -74,7 +74,7 @@ /obj/item/borg/upgrade/vtec/action(mob/living/silicon/robot/R, user = usr) . = ..() if(.) - if(R.speed < 0) + if(!R.cansprint) to_chat(R, "A VTEC unit is already installed!") to_chat(user, "There's no room for another VTEC unit!") return FALSE @@ -82,11 +82,13 @@ //R.speed = -2 // Gotta go fast. //Citadel change - makes vtecs give an ability rather than reducing the borg's speed instantly R.AddAbility(new/obj/effect/proc_holder/silicon/cyborg/vtecControl) + R.cansprint = 0 /obj/item/borg/upgrade/vtec/deactivate(mob/living/silicon/robot/R, user = usr) . = ..() if (.) R.speed = initial(R.speed) + R.cansprint = 1 /obj/item/borg/upgrade/disablercooler name = "cyborg rapid energy blaster cooling module" @@ -409,8 +411,7 @@ icon_state = "cyborg_upgrade3" require_module = 1 module_type = list(/obj/item/robot_module/medical, - /obj/item/robot_module/syndicate_medical, - /obj/item/robot_module/medihound) + /obj/item/robot_module/syndicate_medical) var/list/additional_reagents = list() /obj/item/borg/upgrade/hypospray/action(mob/living/silicon/robot/R, user = usr) @@ -466,23 +467,6 @@ for(var/obj/item/reagent_containers/borghypo/H in R.module.modules) H.bypass_protection = initial(H.bypass_protection) -/obj/item/borg/upgrade/defib - name = "medical cyborg defibrillator" - desc = "An upgrade to the Medical module, installing a built-in \ - defibrillator, for on the scene revival." - icon_state = "cyborg_upgrade3" - require_module = 1 - module_type = list(/obj/item/robot_module/medical, - /obj/item/robot_module/syndicate_medical, - /obj/item/robot_module/medihound) - -/obj/item/borg/upgrade/defib/action(mob/living/silicon/robot/R, user = usr) - . = ..() - if(.) - var/obj/item/twohanded/shockpaddles/cyborg/S = new(R.module) - R.module.basic_modules += S - R.module.add_module(S, FALSE, TRUE) - /obj/item/borg/upgrade/defib/deactivate(mob/living/silicon/robot/R, user = usr) . = ..() if (.) @@ -497,8 +481,7 @@ icon_state = "cyborg_upgrade3" require_module = 1 module_type = list(/obj/item/robot_module/medical, - /obj/item/robot_module/syndicate_medical, - /obj/item/robot_module/medihound) + /obj/item/robot_module/syndicate_medical) /obj/item/borg/upgrade/processor/action(mob/living/silicon/robot/R, user = usr) . = ..() @@ -521,8 +504,7 @@ require_module = 1 module_type = list( /obj/item/robot_module/medical, - /obj/item/robot_module/syndicate_medical, - /obj/item/robot_module/medihound) + /obj/item/robot_module/syndicate_medical) /obj/item/borg/upgrade/advhealth/action(mob/living/silicon/robot/R, user = usr) . = ..() @@ -642,8 +624,7 @@ icon_state = "pinpointer_crew" require_module = TRUE module_type = list(/obj/item/robot_module/medical, - /obj/item/robot_module/syndicate_medical, - /obj/item/robot_module/medihound) + /obj/item/robot_module/syndicate_medical) /obj/item/borg/upgrade/pinpointer/action(mob/living/silicon/robot/R, user = usr) . = ..() diff --git a/code/game/objects/items/stacks/medical.dm b/code/game/objects/items/stacks/medical.dm index 9f3e5f6bd4..178bdd8a5e 100644 --- a/code/game/objects/items/stacks/medical.dm +++ b/code/game/objects/items/stacks/medical.dm @@ -2,8 +2,8 @@ name = "medical pack" singular_name = "medical pack" icon = 'icons/obj/stack_objects.dmi' - amount = 6 - max_amount = 6 + amount = 12 + max_amount = 12 w_class = WEIGHT_CLASS_TINY full_w_class = WEIGHT_CLASS_TINY throw_speed = 3 @@ -11,95 +11,42 @@ resistance_flags = FLAMMABLE max_integrity = 40 novariants = FALSE - var/heal_brute = 0 - var/heal_burn = 0 - var/stop_bleeding = 0 + item_flags = NOBLUDGEON var/self_delay = 50 /obj/item/stack/medical/attack(mob/living/M, mob/user) - if(M.stat == DEAD && !stop_bleeding) - var/t_him = "it" - if(M.gender == MALE) - t_him = "him" - else if(M.gender == FEMALE) - t_him = "her" - to_chat(user, "\The [M] is dead, you cannot help [t_him]!") + . = ..() + if(!M.can_inject(user, TRUE)) return - - if(!iscarbon(M) && !isanimal(M)) - to_chat(user, "You don't know how to apply \the [src] to [M]!") - return 1 - - var/obj/item/bodypart/affecting - if(iscarbon(M)) - var/mob/living/carbon/C = M - affecting = C.get_bodypart(check_zone(user.zone_selected)) - if(!affecting) //Missing limb? - to_chat(user, "[C] doesn't have \a [parse_zone(user.zone_selected)]!") + if(M == user) + user.visible_message("[user] starts to apply \the [src] on [user.p_them()]self...", "You begin applying \the [src] on yourself...") + if(!do_mob(user, M, self_delay, extra_checks=CALLBACK(M, /mob/living/proc/can_inject, user, TRUE))) return - if(ishuman(C)) - var/mob/living/carbon/human/H = C - if(stop_bleeding) - if(H.bleedsuppress) - to_chat(user, "[H]'s bleeding is already bandaged!") - return - else if(!H.bleed_rate) - to_chat(user, "[H] isn't bleeding!") - return + if(heal(M, user)) + log_combat(user, M, "healed", src.name) + use(1) - if(isliving(M)) - if(!M.can_inject(user, 1)) - return +/obj/item/stack/medical/proc/heal(mob/living/M, mob/user) + return - if(user) - if (M != user) - if (isanimal(M)) - var/mob/living/simple_animal/critter = M - if (!(critter.healable)) - to_chat(user, " You cannot use [src] on [M]!") - return - else if (critter.health == critter.maxHealth) - to_chat(user, " [M] is at full health.") - return - else if(src.heal_brute < 1) - to_chat(user, " [src] won't help [M] at all.") - return - user.visible_message("[user] applies [src] on [M].", "You apply [src] on [M].") - else - var/t_himself = "itself" - if(user.gender == MALE) - t_himself = "himself" - else if(user.gender == FEMALE) - t_himself = "herself" - user.visible_message("[user] starts to apply [src] on [t_himself]...", "You begin applying [src] on yourself...") - if(!do_mob(user, M, self_delay, extra_checks=CALLBACK(M, /mob/living/proc/can_inject,user,1))) - return - user.visible_message("[user] applies [src] on [t_himself].", "You apply [src] on yourself.") - - - if(iscarbon(M)) - var/mob/living/carbon/C = M - affecting = C.get_bodypart(check_zone(user.zone_selected)) - if(!affecting) //Missing limb? - to_chat(user, "[C] doesn't have \a [parse_zone(user.zone_selected)]!") - return - if(ishuman(C)) - var/mob/living/carbon/human/H = C - if(stop_bleeding) - if(!H.bleedsuppress) //so you can't stack bleed suppression - H.suppress_bloodloss(stop_bleeding) - if(affecting.status == BODYPART_ORGANIC) //Limb must be organic to be healed - RR - if(affecting.heal_damage(heal_brute, heal_burn)) +/obj/item/stack/medical/proc/heal_carbon(mob/living/carbon/C, mob/user, brute, burn) + var/obj/item/bodypart/affecting = C.get_bodypart(check_zone(user.zone_selected)) + if(!affecting) //Missing limb? + to_chat(user, "[C] doesn't have \a [parse_zone(user.zone_selected)]!") + return + if(affecting.status == BODYPART_ORGANIC) //Limb must be organic to be healed - RR + if(affecting.brute_dam && brute || affecting.burn_dam && burn) + user.visible_message("[user] applies \the [src] on [C]'s [affecting.name].", "You apply \the [src] on [C]'s [affecting.name].") + if(affecting.heal_damage(brute, burn)) C.update_damage_overlays() - else - to_chat(user, "Medicine won't work on a robotic limb!") - else - M.heal_bodypart_damage((src.heal_brute/2), (src.heal_burn/2)) - - use(1) - + return TRUE + to_chat(user, "[C]'s [affecting.name] can not be healed with \the [src].") + return + to_chat(user, "\The [src] won't work on a robotic limb!") +/obj/item/stack/medical/get_belt_overlay() + return mutable_appearance('icons/obj/clothing/belt_overlays.dmi', "pouch") /obj/item/stack/medical/bruise_pack name = "bruise pack" @@ -108,27 +55,54 @@ icon_state = "brutepack" lefthand_file = 'icons/mob/inhands/equipment/medical_lefthand.dmi' righthand_file = 'icons/mob/inhands/equipment/medical_righthand.dmi' - heal_brute = 40 + var/heal_brute = 20 self_delay = 20 grind_results = list("styptic_powder" = 10) +/obj/item/stack/medical/bruise_pack/heal(mob/living/M, mob/user) + if(M.stat == DEAD) + to_chat(user, " [M] is dead. You can not help [M.p_them()]!") + return + if(isanimal(M)) + var/mob/living/simple_animal/critter = M + if (!(critter.healable)) + to_chat(user, " You cannot use \the [src] on [M]!") + return FALSE + else if (critter.health == critter.maxHealth) + to_chat(user, " [M] is at full health.") + return FALSE + user.visible_message("[user] applies \the [src] on [M].", "You apply \the [src] on [M].") + M.heal_bodypart_damage((heal_brute/2)) + return TRUE + if(iscarbon(M)) + return heal_carbon(M, user, heal_brute, 0) + to_chat(user, "You can't heal [M] with the \the [src]!") + /obj/item/stack/medical/bruise_pack/suicide_act(mob/user) user.visible_message("[user] is bludgeoning [user.p_them()]self with [src]! It looks like [user.p_theyre()] trying to commit suicide!") return (BRUTELOSS) /obj/item/stack/medical/gauze name = "medical gauze" - desc = "A roll of elastic cloth that is extremely effective at stopping bleeding, but does not heal wounds." + desc = "A roll of elastic cloth that is extremely effective at stopping bleeding, heals minor wounds." gender = PLURAL singular_name = "medical gauze" icon_state = "gauze" - stop_bleeding = 1800 - self_delay = 20 - max_amount = 12 + var/stop_bleeding = 1800 + var/heal_brute = 5 + self_delay = 10 +/obj/item/stack/medical/gauze/heal(mob/living/M, mob/user) + if(ishuman(M)) + var/mob/living/carbon/human/H = M + if(!H.bleedsuppress && H.bleed_rate) //so you can't stack bleed suppression + H.suppress_bloodloss(stop_bleeding) + to_chat(user, "You stop the bleeding of [M]!") + return TRUE + to_chat(user, "You can not use \the [src] on [M]!") /obj/item/stack/medical/gauze/attackby(obj/item/I, mob/user, params) - if(istype(I, /obj/item/wirecutters) || I.get_sharpness()) + if(I.tool_behaviour == TOOL_WIRECUTTER || I.get_sharpness()) if(get_amount() < 2) to_chat(user, "You need at least two gauzes to do this!") return @@ -149,6 +123,7 @@ singular_name = "improvised gauze" desc = "A roll of cloth roughly cut from something that can stop bleeding, but does not heal wounds." stop_bleeding = 900 + heal_brute = 0 /obj/item/stack/medical/gauze/cyborg materials = list() @@ -163,13 +138,18 @@ icon_state = "ointment" lefthand_file = 'icons/mob/inhands/equipment/medical_lefthand.dmi' righthand_file = 'icons/mob/inhands/equipment/medical_righthand.dmi' - heal_burn = 40 + var/heal_burn = 20 self_delay = 20 grind_results = list("silver_sulfadiazine" = 10) +/obj/item/stack/medical/ointment/heal(mob/living/M, mob/user) + if(M.stat == DEAD) + to_chat(user, " [M] is dead. You can not help [M.p_them()]!") + return + if(iscarbon(M)) + return heal_carbon(M, user, 0, heal_burn) + to_chat(user, "You can't heal [M] with the \the [src]!") + /obj/item/stack/medical/ointment/suicide_act(mob/living/user) user.visible_message("[user] is squeezing \the [src] into [user.p_their()] mouth! [user.p_do(TRUE)]n't [user.p_they()] know that stuff is toxic?") return TOXLOSS - -/obj/item/stack/medical/get_belt_overlay() - return mutable_appearance('icons/obj/clothing/belt_overlays.dmi', "pouch") diff --git a/code/game/objects/items/stacks/sheets/glass.dm b/code/game/objects/items/stacks/sheets/glass.dm index c9fc59a3fe..53209fac2f 100644 --- a/code/game/objects/items/stacks/sheets/glass.dm +++ b/code/game/objects/items/stacks/sheets/glass.dm @@ -39,6 +39,9 @@ GLOBAL_LIST_INIT(glass_recipes, list ( \ /obj/item/stack/sheet/glass/fifty amount = 50 +/obj/item/stack/sheet/glass/five + amount = 5 + /obj/item/stack/sheet/glass/Initialize(mapload, new_amount, merge = TRUE) recipes = GLOB.glass_recipes return ..() diff --git a/code/game/objects/items/stacks/sheets/mineral.dm b/code/game/objects/items/stacks/sheets/mineral.dm index 96546d6eb6..fe42f88f56 100644 --- a/code/game/objects/items/stacks/sheets/mineral.dm +++ b/code/game/objects/items/stacks/sheets/mineral.dm @@ -4,7 +4,6 @@ Mineral Sheets - Sandstone - Sandbags - Diamond - - Snow - Uranium - Plasma - Gold @@ -15,8 +14,9 @@ Mineral Sheets Others: - Adamantine - Mythril - - Enriched Uranium + - Snow - Abductor + - Coal */ /obj/item/stack/sheet/mineral/Initialize(mapload) @@ -55,6 +55,9 @@ GLOBAL_LIST_INIT(sandstone_recipes, list ( \ /obj/item/stack/sheet/mineral/sandstone/thirty amount = 30 +/obj/item/stack/sheet/mineral/sandstone/twelve + amount = 12 + /* * Sandbags */ @@ -407,3 +410,36 @@ GLOBAL_LIST_INIT(abductor_recipes, list ( \ /obj/item/stack/sheet/mineral/abductor/Initialize(mapload, new_amount, merge = TRUE) recipes = GLOB.abductor_recipes . = ..() + +/* + * Coal + */ + +/obj/item/stack/sheet/mineral/coal + name = "coal" + desc = "Someone's gotten on the naughty list." + icon = 'icons/obj/mining.dmi' + icon_state = "slag" + singular_name = "coal lump" + merge_type = /obj/item/stack/sheet/mineral/coal + grind_results = list("carbon" = 20) + +/obj/item/stack/sheet/mineral/coal/attackby(obj/item/W, mob/user, params) + if(W.get_temperature() > 300)//If the temperature of the object is over 300, then ignite + var/turf/T = get_turf(src) + message_admins("Coal ignited by [ADMIN_LOOKUPFLW(user)] in [ADMIN_VERBOSEJMP(T)]") + log_game("Coal ignited by [key_name(user)] in [AREACOORD(T)]") + fire_act(W.get_temperature()) + return TRUE + else + return ..() + +/obj/item/stack/sheet/mineral/coal/fire_act(exposed_temperature, exposed_volume) + atmos_spawn_air("co2=[amount*10];TEMP=[exposed_temperature]") + qdel(src) + +/obj/item/stack/sheet/mineral/coal/five + amount = 5 + +/obj/item/stack/sheet/mineral/coal/ten + amount = 10 \ No newline at end of file diff --git a/code/game/objects/items/stacks/sheets/sheet_types.dm b/code/game/objects/items/stacks/sheets/sheet_types.dm index 33a895cad7..4fc31ea674 100644 --- a/code/game/objects/items/stacks/sheets/sheet_types.dm +++ b/code/game/objects/items/stacks/sheets/sheet_types.dm @@ -228,7 +228,7 @@ GLOBAL_LIST_INIT(wood_recipes, list ( \ /obj/item/stack/sheet/mineral/wood name = "wooden plank" - desc = "One can only guess that this is a bunch of wood." + desc = "One can only guess that this is a bunch of wood. You might be able to make a stake with this if you use something sharp on it" singular_name = "wood plank" icon_state = "sheet-wood" item_state = "sheet-wood" @@ -240,6 +240,35 @@ GLOBAL_LIST_INIT(wood_recipes, list ( \ novariants = TRUE grind_results = list("carbon" = 20) + +/obj/item/stack/sheet/mineral/wood/attackby(obj/item/W, mob/user, params) // NOTE: sheet_types.dm is where the WOOD stack lives. Maybe move this over there. + // Taken from /obj/item/stack/rods/attackby in [rods.dm] + if(W.get_sharpness()) + user.visible_message("[user] begins whittling [src] into a pointy object.", \ + "You begin whittling [src] into a sharp point at one end.", \ + "You hear wood carving.") + // 8 Second Timer + if(!do_after(user, 80, TRUE, src)) + return + // Make Stake + var/obj/item/stake/basic/new_item = new(user.loc) + user.visible_message("[user] finishes carving a stake out of [src].", \ + "You finish carving a stake out of [src].") + // Prepare to Put in Hands (if holding wood) + var/obj/item/stack/sheet/mineral/wood/N = src + var/replace = (user.get_inactive_held_item() == N) + // Use Wood + N.use(1) + // If stack depleted, put item in that hand (if it had one) + if (!N && replace) + user.put_in_hands(new_item) + if(istype(W, merge_type)) + var/obj/item/stack/S = W + if(merge(S)) + to_chat(user, "Your [S.name] stack now contains [S.get_amount()] [S.singular_name]\s.") + else + . = ..() + /obj/item/stack/sheet/mineral/wood/Initialize(mapload, new_amount, merge = TRUE) recipes = GLOB.wood_recipes return ..() @@ -247,6 +276,33 @@ GLOBAL_LIST_INIT(wood_recipes, list ( \ /obj/item/stack/sheet/mineral/wood/fifty amount = 50 +/* + * Bamboo + */ + +GLOBAL_LIST_INIT(bamboo_recipes, list ( \ + new/datum/stack_recipe("punji sticks trap", /obj/structure/punji_sticks, 5, time = 30, one_per_turf = TRUE, on_floor = TRUE), \ + new/datum/stack_recipe("blow gun", /obj/item/gun/syringe/blowgun, 10, time = 70), \ + )) + +/obj/item/stack/sheet/mineral/bamboo + name = "bamboo cuttings" + desc = "Finely cut bamboo sticks." + singular_name = "cut bamboo" + icon_state = "sheet-bamboo" + item_state = "sheet-bamboo" + icon = 'icons/obj/stack_objects.dmi' + throwforce = 15 + armor = list("melee" = 0, "bullet" = 0, "laser" = 0, "energy" = 0, "bomb" = 0, "bio" = 0, "rad" = 0, "fire" = 50, "acid" = 0) + resistance_flags = FLAMMABLE + merge_type = /obj/item/stack/sheet/mineral/bamboo + grind_results = list("carbon" = 5) + +/obj/item/stack/sheet/mineral/bamboo/Initialize(mapload, new_amount, merge = TRUE) + recipes = GLOB.bamboo_recipes + return ..() + + /* * Cloth */ @@ -696,5 +752,3 @@ new /datum/stack_recipe("paper frame door", /obj/structure/mineral_door/paperfra merge_type = /obj/item/stack/sheet/cotton/durathread pull_effort = 70 loom_result = /obj/item/stack/sheet/durathread - - diff --git a/code/game/objects/items/stacks/stack.dm b/code/game/objects/items/stacks/stack.dm index 965e78036a..e8bd50f19b 100644 --- a/code/game/objects/items/stacks/stack.dm +++ b/code/game/objects/items/stacks/stack.dm @@ -350,6 +350,7 @@ . = ..() /obj/item/stack/AltClick(mob/living/user) + . = ..() if(!istype(user) || !user.canUseTopic(src, BE_CLOSE, ismonkey(user))) return if(is_cyborg) @@ -363,10 +364,11 @@ max = get_amount() stackmaterial = min(max, stackmaterial) if(stackmaterial == null || stackmaterial <= 0 || !user.canUseTopic(src, BE_CLOSE, ismonkey(user))) - return + return TRUE else change_stack(user, stackmaterial) to_chat(user, "You take [stackmaterial] sheets out of the stack") + return TRUE /obj/item/stack/proc/change_stack(mob/user, amount) if(!use(amount, TRUE, FALSE)) diff --git a/code/game/objects/items/storage/backpack.dm b/code/game/objects/items/storage/backpack.dm index 15db8e2ebd..d200471b5b 100644 --- a/code/game/objects/items/storage/backpack.dm +++ b/code/game/objects/items/storage/backpack.dm @@ -551,7 +551,7 @@ /obj/item/storage/backpack/duffelbag/syndie/med/medicalbundle/PopulateContents() new /obj/item/clothing/shoes/magboots/syndie(src) - new /obj/item/storage/firstaid/tactical(src) + new /obj/item/storage/firstaid/tactical/nukeop(src) new /obj/item/gun/ballistic/automatic/l6_saw/toy(src) new /obj/item/ammo_box/foambox/riot(src) diff --git a/code/game/objects/items/storage/belt.dm b/code/game/objects/items/storage/belt.dm index 47d2d70db8..3a4579d3f8 100755 --- a/code/game/objects/items/storage/belt.dm +++ b/code/game/objects/items/storage/belt.dm @@ -757,23 +757,13 @@ STR.rustle_sound = FALSE STR.max_w_class = WEIGHT_CLASS_BULKY STR.can_hold = typecacheof(fitting_swords) + STR.quickdraw = TRUE /obj/item/storage/belt/sabre/examine(mob/user) . = ..() if(length(contents)) . += "Alt-click it to quickly draw the blade." -/obj/item/storage/belt/sabre/AltClick(mob/user) - if(!iscarbon(user) || !user.canUseTopic(src, BE_CLOSE, ismonkey(user))) - return - if(length(contents)) - var/obj/item/I = contents[1] - user.visible_message("[user] takes [I] out of [src].", "You take [I] out of [src].") - user.put_in_hands(I) - update_icon() - else - to_chat(user, "[src] is empty.") - /obj/item/storage/belt/sabre/update_icon() . = ..() if(isliving(loc)) diff --git a/code/game/objects/items/storage/boxes.dm b/code/game/objects/items/storage/boxes.dm index 6c11745f1a..e214db3c71 100644 --- a/code/game/objects/items/storage/boxes.dm +++ b/code/game/objects/items/storage/boxes.dm @@ -901,7 +901,7 @@ #undef HEART #undef SMILEY -/obj/item/storage/box/ingredients //This box is for the randomely chosen version the chef spawns with, it shouldn't actually exist. +/obj/item/storage/box/ingredients //This box is for the randomly chosen version the chef spawns with, it shouldn't actually exist. name = "ingredients box" illustration = "fruit" var/theme_name diff --git a/code/game/objects/items/storage/fancy.dm b/code/game/objects/items/storage/fancy.dm index 6cc2cb6882..f05078de81 100644 --- a/code/game/objects/items/storage/fancy.dm +++ b/code/game/objects/items/storage/fancy.dm @@ -157,6 +157,7 @@ to_chat(user, "You take \a [W] out of the pack.") else to_chat(user, "There are no [icon_type]s left in the pack.") + return TRUE /obj/item/storage/fancy/cigarettes/update_icon() if(fancy_open || !contents.len) diff --git a/code/game/objects/items/storage/firstaid.dm b/code/game/objects/items/storage/firstaid.dm index 0d9b86fd68..8c96e567d1 100644 --- a/code/game/objects/items/storage/firstaid.dm +++ b/code/game/objects/items/storage/firstaid.dm @@ -176,18 +176,36 @@ . = ..() var/datum/component/storage/STR = GetComponent(/datum/component/storage) STR.max_w_class = WEIGHT_CLASS_NORMAL + STR.max_combined_w_class = 16 + STR.max_items = 8 /obj/item/storage/firstaid/tactical/PopulateContents() if(empty) return new /obj/item/stack/medical/gauze(src) new /obj/item/defibrillator/compact/combat/loaded(src) - new /obj/item/reagent_containers/hypospray/combat(src) - new /obj/item/reagent_containers/pill/patch/styptic(src) - new /obj/item/reagent_containers/pill/patch/silver_sulf(src) - new /obj/item/reagent_containers/syringe/lethal/choral(src) + new /obj/item/reagent_containers/hypospray/combat/omnizine(src) + new /obj/item/reagent_containers/medspray/styptic(src) + new /obj/item/reagent_containers/medspray/silver_sulf(src) + new /obj/item/healthanalyzer/advanced(src) + new /obj/item/reagent_containers/syringe/lethal/choral(src) // what the fuck does anyone use this piece of shit for new /obj/item/clothing/glasses/hud/health/night(src) +/obj/item/storage/firstaid/tactical/nukeop + name = "improved combat medical kit" + +/obj/item/storage/firstaid/tactical/nukeop/PopulateContents() + if(empty) + return + new /obj/item/stack/medical/gauze(src) + new /obj/item/defibrillator/compact/combat/loaded(src) + new /obj/item/reagent_containers/hypospray/combat(src) + new /obj/item/reagent_containers/medspray/styptic(src) + new /obj/item/reagent_containers/medspray/silver_sulf(src) + new /obj/item/healthanalyzer/advanced(src) + new /obj/item/reagent_containers/syringe/lethal/choral(src) // what the fuck does anyone use this piece of shit for + new /obj/item/clothing/glasses/hud/health/night(src) + /* * Pill Bottles */ diff --git a/code/game/objects/items/storage/lockbox.dm b/code/game/objects/items/storage/lockbox.dm index bd234d8188..3d27370334 100644 --- a/code/game/objects/items/storage/lockbox.dm +++ b/code/game/objects/items/storage/lockbox.dm @@ -114,11 +114,12 @@ . += "Alt-click to [open ? "close":"open"] it." /obj/item/storage/lockbox/medal/AltClick(mob/user) + . = ..() if(user.canUseTopic(src, BE_CLOSE)) if(!SEND_SIGNAL(src, COMSIG_IS_STORAGE_LOCKED)) open = (open ? FALSE : TRUE) update_icon() - ..() + return TRUE /obj/item/storage/lockbox/medal/PopulateContents() new /obj/item/clothing/accessory/medal/gold/captain(src) diff --git a/code/game/objects/items/storage/uplink_kits.dm b/code/game/objects/items/storage/uplink_kits.dm index 223c8e9cf6..817465a16c 100644 --- a/code/game/objects/items/storage/uplink_kits.dm +++ b/code/game/objects/items/storage/uplink_kits.dm @@ -390,4 +390,10 @@ new /obj/item/seeds/random(src) if(prob(50)) - new /obj/item/seeds/random(src) //oops, an additional packet might have slipped its way into the box \ No newline at end of file + new /obj/item/seeds/random(src) //oops, an additional packet might have slipped its way into the box + +/obj/item/storage/box/syndie_kit/revolver + +/obj/item/storage/box/syndie_kit/revolver/PopulateContents() + new /obj/item/gun/ballistic/revolver(src) + new /obj/item/ammo_box/a357(src) diff --git a/code/game/objects/items/toys.dm b/code/game/objects/items/toys.dm index 8d3a64b3d5..08c43f0437 100644 --- a/code/game/objects/items/toys.dm +++ b/code/game/objects/items/toys.dm @@ -338,11 +338,12 @@ M.update_inv_hands() /obj/item/toy/sword/cx/AltClick(mob/living/user) + . = ..() if(!in_range(src, user)) //Basic checks to prevent abuse return if(user.incapacitated() || !istype(user)) to_chat(user, "You can't do that right now!") - return + return TRUE if(alert("Are you sure you want to recolor your blade?", "Confirm Repaint", "Yes", "No") == "Yes") var/energy_color_input = input(usr,"","Choose Energy Color",light_color) as color|null @@ -350,6 +351,7 @@ light_color = sanitize_hexcolor(energy_color_input, desired_format=6, include_crunch=1) update_icon() update_light() + return TRUE /obj/item/toy/sword/cx/worn_overlays(isinhands, icon_file) . = ..() @@ -401,6 +403,7 @@ righthand_file = 'icons/mob/inhands/equipment/toolbox_righthand.dmi' var/active = FALSE icon = 'icons/obj/items_and_weapons.dmi' + hitsound = 'sound/weapons/smash.ogg' attack_verb = list("robusted") /obj/item/toy/windupToolbox/attack_self(mob/user) @@ -408,13 +411,33 @@ icon_state = "his_grace_awakened" to_chat(user, "You wind up [src], it begins to rumble.") active = TRUE + playsound(src, 'sound/effects/pope_entry.ogg', 100) + Rumble() addtimer(CALLBACK(src, .proc/stopRumble), 600) else to_chat(user, "[src] is already active.") +/obj/item/toy/windupToolbox/proc/Rumble() + var/static/list/transforms + if(!transforms) + var/matrix/M1 = matrix() + var/matrix/M2 = matrix() + var/matrix/M3 = matrix() + var/matrix/M4 = matrix() + M1.Translate(-1, 0) + M2.Translate(0, 1) + M3.Translate(1, 0) + M4.Translate(0, -1) + transforms = list(M1, M2, M3, M4) + animate(src, transform=transforms[1], time=0.2, loop=-1) + animate(transform=transforms[2], time=0.1) + animate(transform=transforms[3], time=0.2) + animate(transform=transforms[4], time=0.3) + /obj/item/toy/windupToolbox/proc/stopRumble() icon_state = initial(icon_state) active = FALSE + animate(src, transform=matrix()) /* * Subtype of Double-Bladed Energy Swords @@ -864,9 +887,10 @@ return ..() /obj/item/toy/cards/deck/MouseDrop(atom/over_object) + . = ..() var/mob/living/M = usr if(!istype(M) || usr.incapacitated() || usr.lying) - return ..() + return if(Adjacent(usr)) if(over_object == M && loc != M) M.put_in_hands(src) @@ -878,9 +902,7 @@ to_chat(usr, "You pick up the deck.") else - . = ..() - if(!.) - to_chat(usr, "You can't reach it from here!") + to_chat(usr, "You can't reach it from here!") diff --git a/code/game/objects/items/trash.dm b/code/game/objects/items/trash.dm index 37ab948332..b2158eb1c8 100644 --- a/code/game/objects/items/trash.dm +++ b/code/game/objects/items/trash.dm @@ -72,17 +72,10 @@ resistance_flags = NONE grind_results = list("aluminium" = 10) +/obj/item/trash/boritos + name = "boritos bag" + icon_state = "boritos" + grind_results = list("aluminium" = 1) //from the mylar bag + /obj/item/trash/attack(mob/M, mob/living/user) return - -/obj/item/trash/coal - name = "lump of coal" - icon = 'icons/obj/mining.dmi' - icon_state = "slag" - desc = "Someone's gotten on the naughty list." - grind_results = list("carbon" = 20) - -/obj/item/trash/coal/burn() - visible_message("[src] fuses into a diamond! Someone wasn't so naughty after all...") - new /obj/item/stack/ore/diamond(loc) - qdel(src) diff --git a/code/game/objects/items/twohanded.dm b/code/game/objects/items/twohanded.dm index f559d2801d..dd7d46d0d7 100644 --- a/code/game/objects/items/twohanded.dm +++ b/code/game/objects/items/twohanded.dm @@ -541,6 +541,7 @@ clean_blood() /obj/item/twohanded/dualsaber/hypereutactic/AltClick(mob/living/user) + . = ..() if(!user.canUseTopic(src, BE_CLOSE, FALSE) || hacked) return if(user.incapacitated() || !istype(user)) @@ -553,6 +554,7 @@ light_color = sanitize_hexcolor(energy_color_input, desired_format=6, include_crunch=1) update_icon() update_light() + return TRUE /obj/item/twohanded/dualsaber/hypereutactic/worn_overlays(isinhands, icon_file) . = ..() @@ -659,6 +661,7 @@ qdel(src) /obj/item/twohanded/spear/AltClick(mob/user) + . = ..() if(user.canUseTopic(src, BE_CLOSE)) ..() if(!explosive) @@ -667,6 +670,7 @@ var/input = stripped_input(user,"What do you want your war cry to be? You will shout it when you hit someone in melee.", ,"", 50) if(input) src.war_cry = input + return TRUE /obj/item/twohanded/spear/CheckParts(list/parts_list) var/obj/item/shard/tip = locate() in parts_list diff --git a/code/game/objects/objs.dm b/code/game/objects/objs.dm index e6c7f987d5..51386c791c 100644 --- a/code/game/objects/objs.dm +++ b/code/game/objects/objs.dm @@ -234,6 +234,7 @@ . = ..() if(unique_reskin && (!current_skin || always_reskinnable) && user.canUseTopic(src, BE_CLOSE, NO_DEXTERY)) reskin_obj(user) + return TRUE /obj/proc/reskin_obj(mob/M) if(!LAZYLEN(unique_reskin)) diff --git a/code/game/objects/structures/beds_chairs/chair.dm b/code/game/objects/structures/beds_chairs/chair.dm index 9643ff7e07..e61a17b4ec 100644 --- a/code/game/objects/structures/beds_chairs/chair.dm +++ b/code/game/objects/structures/beds_chairs/chair.dm @@ -449,6 +449,9 @@ item_chair = null var/turns = 0 +/obj/structure/chair/brass/ComponentInitialize() + return //it spins with the power of ratvar, not components. + /obj/structure/chair/brass/Destroy() STOP_PROCESSING(SSfastprocess, src) . = ..() @@ -464,6 +467,7 @@ return /obj/structure/chair/brass/AltClick(mob/living/user) + . = ..() turns = 0 if(!istype(user) || !user.canUseTopic(src, BE_CLOSE, ismonkey(user))) return @@ -475,6 +479,7 @@ user.visible_message("[user] stops [src]'s uncontrollable spinning.", \ "You grab [src] and stop its wild spinning.") STOP_PROCESSING(SSfastprocess, src) + return TRUE /obj/structure/chair/bronze name = "brass chair" diff --git a/code/game/objects/structures/crates_lockers/closets.dm b/code/game/objects/structures/crates_lockers/closets.dm index 0f8963012f..38944c0384 100644 --- a/code/game/objects/structures/crates_lockers/closets.dm +++ b/code/game/objects/structures/crates_lockers/closets.dm @@ -342,25 +342,21 @@ . = TRUE if(opened) if(istype(W, cutting_tool)) + var/welder = FALSE if(istype(W, /obj/item/weldingtool)) if(!W.tool_start_check(user, amount=0)) return - - to_chat(user, "You begin cutting \the [src] apart...") - if(W.use_tool(src, user, 40, volume=50)) - if(eigen_teleport) - to_chat(user, "The unstable nature of \the [src] makes it impossible to cut!") - return - if(!opened) - return - user.visible_message("[user] slices apart \the [src].", - "You cut \the [src] apart with \the [W].", - "You hear welding.") - deconstruct(TRUE) - return - else // for example cardboard box is cut with wirecutters - user.visible_message("[user] cut apart \the [src].", \ - "You cut \the [src] apart with \the [W].") + to_chat(user, "You begin [welder ? "slicing" : "deconstructing"] \the [src] apart...") + welder = TRUE + if(W.use_tool(src, user, 40, volume=50)) + if(eigen_teleport) + to_chat(user, "The unstable nature of \the [src] makes it impossible to [welder ? "slice" : "deconstruct"]!") + return + if(!opened) + return + user.visible_message("[user] [welder ? "slice" : "deconstruct"]s apart \the [src].", + "You [welder ? "slice" : "deconstruct"] \the [src] apart with \the [W].", + "You hear [welder ? "welding" : "rustling of screws and metal"].") deconstruct(TRUE) return if(user.transferItemToLoc(W, drop_location())) // so we put in unlit welder too @@ -526,11 +522,12 @@ to_chat(user, "You fail to break out of [src]!") /obj/structure/closet/AltClick(mob/user) - ..() + . = ..() if(!user.canUseTopic(src, be_close=TRUE) || !isturf(loc)) to_chat(user, "You can't do that right now!") - return + return TRUE togglelock(user) + return TRUE /obj/structure/closet/CtrlShiftClick(mob/living/user) if(!HAS_TRAIT(user, TRAIT_SKITTISH)) diff --git a/code/game/objects/structures/crates_lockers/closets/gimmick.dm b/code/game/objects/structures/crates_lockers/closets/gimmick.dm index c9a2ad54ff..6548ec737c 100644 --- a/code/game/objects/structures/crates_lockers/closets/gimmick.dm +++ b/code/game/objects/structures/crates_lockers/closets/gimmick.dm @@ -4,6 +4,8 @@ icon_state = "cabinet" resistance_flags = FLAMMABLE max_integrity = 70 + material_drop = /obj/item/stack/sheet/mineral/wood + cutting_tool = /obj/item/screwdriver /obj/structure/closet/acloset name = "strange closet" diff --git a/code/game/objects/structures/crates_lockers/closets/secure/bar.dm b/code/game/objects/structures/crates_lockers/closets/secure/bar.dm index f0c1495281..bfcb00f285 100644 --- a/code/game/objects/structures/crates_lockers/closets/secure/bar.dm +++ b/code/game/objects/structures/crates_lockers/closets/secure/bar.dm @@ -4,6 +4,8 @@ icon_state = "cabinet" resistance_flags = FLAMMABLE max_integrity = 70 + material_drop = /obj/item/stack/sheet/mineral/wood + cutting_tool = /obj/item/screwdriver /obj/structure/closet/secure_closet/bar/PopulateContents() ..() diff --git a/code/game/objects/structures/crates_lockers/closets/secure/personal.dm b/code/game/objects/structures/crates_lockers/closets/secure/personal.dm index 376abef33e..8cf0852aaa 100644 --- a/code/game/objects/structures/crates_lockers/closets/secure/personal.dm +++ b/code/game/objects/structures/crates_lockers/closets/secure/personal.dm @@ -44,6 +44,8 @@ icon_state = "cabinet" resistance_flags = FLAMMABLE max_integrity = 70 + material_drop = /obj/item/stack/sheet/mineral/wood + cutting_tool = /obj/item/screwdriver /obj/structure/closet/secure_closet/personal/cabinet/PopulateContents() new /obj/item/storage/backpack/satchel/leather/withwallet( src ) diff --git a/code/game/objects/structures/crates_lockers/closets/secure/security.dm b/code/game/objects/structures/crates_lockers/closets/secure/security.dm index a50ee6988c..835be8d2fc 100644 --- a/code/game/objects/structures/crates_lockers/closets/secure/security.dm +++ b/code/game/objects/structures/crates_lockers/closets/secure/security.dm @@ -161,12 +161,16 @@ ..() new /obj/item/clothing/accessory/armband/medblue(src) new /obj/item/encryptionkey/headset_med(src) + /obj/structure/closet/secure_closet/detective name = "\improper detective's cabinet" req_access = list(ACCESS_FORENSICS_LOCKERS) icon_state = "cabinet" resistance_flags = FLAMMABLE max_integrity = 70 + material_drop = /obj/item/stack/sheet/mineral/wood + cutting_tool = /obj/item/screwdriver + /obj/structure/closet/secure_closet/detective/PopulateContents() ..() new /obj/item/clothing/under/rank/det(src) diff --git a/code/game/objects/structures/crates_lockers/crates.dm b/code/game/objects/structures/crates_lockers/crates.dm index 23703c7891..e416b2b436 100644 --- a/code/game/objects/structures/crates_lockers/crates.dm +++ b/code/game/objects/structures/crates_lockers/crates.dm @@ -79,6 +79,15 @@ material_drop = /obj/item/stack/sheet/mineral/wood material_drop_amount = 5 +/obj/structure/closet/crate/coffin/examine(mob/user) + . = ..() + if(user.mind.has_antag_datum(ANTAG_DATUM_BLOODSUCKER)) + . += {"This is a coffin which you can use to regenerate your burns and other wounds faster."} + . += {"You can also thicken your blood if you survive the day, and hide from the sun safely while inside."} + /* if(user.mind.has_antag_datum(ANTAG_DATUM_VASSAL) + . += {"This is a coffin which your master can use to shield himself from the unforgiving sun.\n + You yourself are still human and dont need it. Yet."} */ + /obj/structure/closet/crate/internals desc = "An internals crate." name = "internals crate" diff --git a/code/game/objects/structures/divine.dm b/code/game/objects/structures/divine.dm index 5fd480f6fd..b8137d831b 100644 --- a/code/game/objects/structures/divine.dm +++ b/code/game/objects/structures/divine.dm @@ -40,11 +40,11 @@ last_process = world.time to_chat(user, "The water feels warm and soothing as you touch it. The fountain immediately dries up shortly afterwards.") user.reagents.add_reagent("godblood",20) - update_icons() - addtimer(CALLBACK(src, .proc/update_icons), time_between_uses) + update_icon() + addtimer(CALLBACK(src, .proc/update_icon), time_between_uses) -/obj/structure/healingfountain/proc/update_icons() +/obj/structure/healingfountain/update_icon() if(last_process + time_between_uses > world.time) icon_state = "fountain" else diff --git a/code/game/objects/structures/extinguisher.dm b/code/game/objects/structures/extinguisher.dm index 23643ae9cd..d6beaa2628 100644 --- a/code/game/objects/structures/extinguisher.dm +++ b/code/game/objects/structures/extinguisher.dm @@ -102,9 +102,11 @@ return attack_hand(user) /obj/structure/extinguisher_cabinet/AltClick(mob/living/user) + . = ..() if(!istype(user) || !user.canUseTopic(src, BE_CLOSE, ismonkey(user))) return toggle_cabinet(user) + return TRUE /obj/structure/extinguisher_cabinet/proc/toggle_cabinet(mob/user) if(opened && broken) diff --git a/code/game/objects/structures/holosign.dm b/code/game/objects/structures/holosign.dm index 4c6b9732d0..1f007b6993 100644 --- a/code/game/objects/structures/holosign.dm +++ b/code/game/objects/structures/holosign.dm @@ -14,8 +14,8 @@ if(source_projector) projector = source_projector projector.signs += src + SSvis_overlays.add_vis_overlay(src, icon, icon_state, ABOVE_MOB_LAYER, plane, dir, alpha, RESET_ALPHA) //you see mobs under it, but you hit them like they are above it alpha = 0 - SSvis_overlays.add_vis_overlay(src, icon, icon_state, ABOVE_MOB_LAYER, plane, dir, add_appearance_flags = RESET_ALPHA) //you see mobs under it, but you hit them like they are above it /obj/structure/holosign/Destroy() if(projector) diff --git a/code/game/objects/structures/mirror.dm b/code/game/objects/structures/mirror.dm index b15d686b7b..ba45ae5ef0 100644 --- a/code/game/objects/structures/mirror.dm +++ b/code/game/objects/structures/mirror.dm @@ -20,10 +20,9 @@ return if(broken || !Adjacent(user)) return - + if(ishuman(user)) var/mob/living/carbon/human/H = user - //see code/modules/mob/dead/new_player/preferences.dm at approx line 545 for comments! //this is largely copypasted from there. @@ -226,9 +225,13 @@ if(!user.canUseTopic(src, BE_CLOSE, FALSE, NO_TK)) return if(new_eye_color) - H.eye_color = sanitize_hexcolor(new_eye_color) + var/n_color = sanitize_hexcolor(new_eye_color) + var/obj/item/organ/eyes/eyes = H.getorganslot(ORGAN_SLOT_EYES) + if(eyes) + eyes.eye_color = n_color + H.eye_color = n_color H.dna.update_ui_block(DNA_EYE_COLOR_BLOCK) - H.update_body() + H.dna.species.handle_body() if(choice) curse(user) diff --git a/code/game/objects/structures/morgue.dm b/code/game/objects/structures/morgue.dm index 840597ba4c..cdd4cb5a31 100644 --- a/code/game/objects/structures/morgue.dm +++ b/code/game/objects/structures/morgue.dm @@ -167,11 +167,12 @@ GLOBAL_LIST_EMPTY(bodycontainers) //Let them act as spawnpoints for revenants an . += "The speaker is [beeper ? "enabled" : "disabled"]. Alt-click to toggle it." /obj/structure/bodycontainer/morgue/AltClick(mob/user) - ..() + . = ..() if(!user.canUseTopic(src, !issilicon(user))) return beeper = !beeper to_chat(user, "You turn the speaker function [beeper ? "on" : "off"].") + return TRUE /obj/structure/bodycontainer/morgue/update_icon() if (!connected || connected.loc != src) // Open or tray is gone. diff --git a/code/game/objects/structures/reflector.dm b/code/game/objects/structures/reflector.dm index 77aad5a9dd..cde60e15c1 100644 --- a/code/game/objects/structures/reflector.dm +++ b/code/game/objects/structures/reflector.dm @@ -167,10 +167,12 @@ return TRUE /obj/structure/reflector/AltClick(mob/user) + . = ..() if(!user.canUseTopic(src, BE_CLOSE, ismonkey(user))) return else if(finished) rotate(user) + return TRUE //TYPES OF REFLECTORS, SINGLE, DOUBLE, BOX diff --git a/code/game/objects/structures/window.dm b/code/game/objects/structures/window.dm index 9dee1e26cc..58588c5693 100644 --- a/code/game/objects/structures/window.dm +++ b/code/game/objects/structures/window.dm @@ -285,6 +285,13 @@ . += new /obj/item/shard(location) /obj/structure/window/proc/can_be_rotated(mob/user,rotation_type) + if (get_dist(src,user) > 1) + if (iscarbon(user)) + var/mob/living/carbon/H = user + if (!(H.dna && H.dna.check_mutation(TK) && tkMaxRangeCheck(src,H))) + return FALSE + else + return FALSE if(anchored) to_chat(user, "[src] cannot be rotated while it is fastened to the floor!") return FALSE diff --git a/code/game/say.dm b/code/game/say.dm index 60189618be..7f01bf163d 100644 --- a/code/game/say.dm +++ b/code/game/say.dm @@ -28,19 +28,21 @@ GLOBAL_LIST_INIT(freqtospan, list( language = get_default_language() send_speech(message, 7, src, , spans, message_language=language) -/atom/movable/proc/Hear(message, atom/movable/speaker, message_language, raw_message, radio_freq, list/spans, message_mode) +/atom/movable/proc/Hear(message, atom/movable/speaker, message_language, raw_message, radio_freq, list/spans, message_mode, atom/movable/source) SEND_SIGNAL(src, COMSIG_MOVABLE_HEAR, args) /atom/movable/proc/can_speak() return 1 -/atom/movable/proc/send_speech(message, range = 7, obj/source = src, bubble_type, list/spans, datum/language/message_language = null, message_mode) - var/rendered = compose_message(src, message_language, message, , spans, message_mode) +/atom/movable/proc/send_speech(message, range = 7, atom/movable/source = src, bubble_type, list/spans, datum/language/message_language = null, message_mode) + var/rendered = compose_message(src, message_language, message, , spans, message_mode, source) for(var/_AM in get_hearers_in_view(range, source)) var/atom/movable/AM = _AM - AM.Hear(rendered, src, message_language, message, , spans, message_mode) + AM.Hear(rendered, src, message_language, message, , spans, message_mode, source) -/atom/movable/proc/compose_message(atom/movable/speaker, datum/language/message_language, raw_message, radio_freq, list/spans, message_mode, face_name = FALSE) +/atom/movable/proc/compose_message(atom/movable/speaker, datum/language/message_language, raw_message, radio_freq, list/spans, message_mode, face_name = FALSE, atom/movable/source) + if(!source) + source = speaker //This proc uses text() because it is faster than appending strings. Thanks BYOND. //Basic span var/spanpart1 = "" @@ -124,8 +126,14 @@ GLOBAL_LIST_INIT(freqtospan, list( return returntext return "[copytext("[freq]", 1, 4)].[copytext("[freq]", 4, 5)]" -/proc/attach_spans(input, list/spans) - return "[message_spans_start(spans)][input]" +/atom/movable/proc/attach_spans(input, list/spans) + var/customsayverb = findtext(input, "*") + if(customsayverb) + input = capitalize(copytext(input, customsayverb+1)) + if(input) + return "[message_spans_start(spans)][input]" + else + return /proc/message_spans_start(list/spans) var/output = "Transferring to virtual reality...") - if(vr_mob && (!istype(vr_mob) || !vr_mob.InCritical()) && !vr_mob.GetComponent(/datum/component/virtual_reality)) - vr_mob.AddComponent(/datum/component/virtual_reality, human_occupant, src, you_die_in_the_game_you_die_for_real) - to_chat(vr_mob, "Transfer successful! You are now playing as [vr_mob] in VR!") - else + var/mob/M = occupant + if(M?.mind && M == usr) + to_chat(M, "Transferring to virtual reality...") + var/datum/component/virtual_reality/VR + if(vr_mob) + VR = vr_mob.GetComponent(/datum/component/virtual_reality) + if(!(VR?.connect(M))) if(allow_creating_vr_mobs) - to_chat(occupant, "Virtual avatar not found, attempting to create one...") + to_chat(occupant, "Virtual avatar [vr_mob ? "corrupted" : "missing"], attempting to create one...") var/obj/effect/landmark/vr_spawn/V = get_vr_spawnpoint() var/turf/T = get_turf(V) if(T) - SStgui.close_user_uis(occupant, src) new_player(occupant, T, V.vr_outfit) - to_chat(vr_mob, "Transfer successful! You are now playing as [vr_mob] in VR!") else to_chat(occupant, "Virtual world misconfigured, aborting transfer") else to_chat(occupant, "The virtual world does not support the creation of new virtual avatars, aborting transfer") + else + to_chat(vr_mob, "Transfer successful! You are now playing as [vr_mob] in VR!") . = TRUE if("delete_avatar") if(!occupant || usr == occupant) @@ -157,17 +154,31 @@ for(var/obj/effect/landmark/vr_spawn/V in GLOB.landmarks_list) GLOB.vr_spawnpoints[V.vr_category] = V -/obj/machinery/vr_sleeper/proc/new_player(mob/living/carbon/human/H, location, datum/outfit/outfit, transfer = TRUE) - if(!H) +/obj/machinery/vr_sleeper/proc/new_player(mob/M, location, datum/outfit/outfit, transfer = TRUE) + if(!M) return cleanup_vr_mob() vr_mob = new virtual_mob_type(location) - if(vr_mob.build_virtual_character(H, outfit)) - var/mob/living/carbon/human/vr_H = vr_mob - vr_H.updateappearance(TRUE, TRUE, TRUE) - if(!transfer || !H.mind) - return - vr_mob.AddComponent(/datum/component/virtual_reality, H, src, you_die_in_the_game_you_die_for_real) + if(vr_mob.build_virtual_character(M, outfit) && iscarbon(vr_mob)) + var/mob/living/carbon/C = vr_mob + C.updateappearance(TRUE, TRUE, TRUE) + var/datum/component/virtual_reality/VR = vr_mob.AddComponent(/datum/component/virtual_reality, you_die_in_the_game_you_die_for_real) + if(VR.connect(M)) + RegisterSignal(VR, COMSIG_COMPONENT_UNREGISTER_PARENT, .proc/unset_vr_mob) + RegisterSignal(VR, COMSIG_COMPONENT_REGISTER_PARENT, .proc/set_vr_mob) + if(!only_current_user_can_interact) + VR.RegisterSignal(src, COMSIG_ATOM_EMAG_ACT, /datum/component/virtual_reality.proc/you_only_live_once) + VR.RegisterSignal(src, COMSIG_MACHINE_EJECT_OCCUPANT, /datum/component/virtual_reality.proc/revert_to_reality) + VR.RegisterSignal(src, COMSIG_PARENT_QDELETING, /datum/component/virtual_reality.proc/machine_destroyed) + to_chat(vr_mob, "Transfer successful! You are now playing as [vr_mob] in VR!") + else + to_chat(M, "Transfer failed! virtual reality data likely corrupted!") + +/obj/machinery/vr_sleeper/proc/unset_vr_mob(datum/component/virtual_reality/VR) + vr_mob = null + +/obj/machinery/vr_sleeper/proc/set_vr_mob(datum/component/virtual_reality/VR) + vr_mob = VR.parent /obj/machinery/vr_sleeper/proc/cleanup_vr_mob() if(vr_mob) @@ -222,6 +233,7 @@ qdel(C) for (var/A in corpse_party) var/mob/M = A - if(get_area(M) == vr_area && M.stat == DEAD) + if(M && M.stat == DEAD && get_area(M) == vr_area) qdel(M) + corpse_party -= M addtimer(CALLBACK(src, .proc/clean_up), 3 MINUTES) diff --git a/code/modules/admin/sound_emitter.dm b/code/modules/admin/sound_emitter.dm index 2901659ce9..702e2071bd 100644 --- a/code/modules/admin/sound_emitter.dm +++ b/code/modules/admin/sound_emitter.dm @@ -52,9 +52,11 @@ edit_emitter(user) /obj/effect/sound_emitter/AltClick(mob/user) + . = ..() if(check_rights_for(user.client, R_SOUNDS)) activate(user) to_chat(user, "Sound emitter activated.") + return TRUE /obj/effect/sound_emitter/proc/edit_emitter(mob/user) var/dat = "" diff --git a/code/modules/antagonists/_common/antag_spawner.dm b/code/modules/antagonists/_common/antag_spawner.dm index 3723b99f4e..c8fbfde4d2 100644 --- a/code/modules/antagonists/_common/antag_spawner.dm +++ b/code/modules/antagonists/_common/antag_spawner.dm @@ -37,6 +37,8 @@ dat += "Your apprentice is training to cast spells that will aid your survival. They know Forcewall and Charge and come with a Staff of Healing.
" dat += "Robeless
" dat += "Your apprentice is training to cast spells without their robes. They know Knock and Mindswap.
" + dat += "Martial Artist
" + dat += "Your apprentice is training in ancient martial arts. They know the Plasmafist and Nuclear Fist.
" user << browse(dat, "window=radio") onclose(user, "radio") return diff --git a/code/modules/antagonists/abductor/abductor.dm b/code/modules/antagonists/abductor/abductor.dm index e8d30e8dbe..92504641a9 100644 --- a/code/modules/antagonists/abductor/abductor.dm +++ b/code/modules/antagonists/abductor/abductor.dm @@ -65,6 +65,8 @@ //Equip var/mob/living/carbon/human/H = owner.current H.set_species(/datum/species/abductor) + var/obj/item/organ/tongue/abductor/T = H.getorganslot(ORGAN_SLOT_TONGUE) + T.mothership = "[team.name]" H.real_name = "[team.name] [sub_role]" H.equipOutfit(outfit) diff --git a/code/modules/antagonists/abductor/equipment/abduction_gear.dm b/code/modules/antagonists/abductor/equipment/abduction_gear.dm index b708c59ef7..433f52306b 100644 --- a/code/modules/antagonists/abductor/equipment/abduction_gear.dm +++ b/code/modules/antagonists/abductor/equipment/abduction_gear.dm @@ -17,7 +17,7 @@ actions_types = list(/datum/action/item_action/hands_free/activate) allowed = list( /obj/item/abductor, - /obj/item/abductor_baton, + /obj/item/abductor/baton, /obj/item/melee/baton, /obj/item/gun/energy, /obj/item/restraints/handcuffs @@ -57,7 +57,7 @@ /obj/item/clothing/suit/armor/abductor/vest/item_action_slot_check(slot, mob/user, datum/action/A) if(slot == SLOT_WEAR_SUIT) //we only give the mob the ability to activate the vest if he's actually wearing it. - return 1 + return TRUE /obj/item/clothing/suit/armor/abductor/vest/proc/SetDisguise(datum/icon_snapshot/entry) disguise = entry @@ -89,11 +89,9 @@ /obj/item/clothing/suit/armor/abductor/vest/hit_reaction(mob/living/carbon/human/owner, atom/movable/hitby, attack_text = "the attack", final_block_chance = 0, damage = 0, attack_type = MELEE_ATTACK) DeactivateStealth() - return 0 /obj/item/clothing/suit/armor/abductor/vest/IsReflect() DeactivateStealth() - return 0 /obj/item/clothing/suit/armor/abductor/vest/ui_action_click() switch(mode) @@ -111,7 +109,10 @@ to_chat(loc, "Combat injection is still recharging.") return var/mob/living/carbon/human/M = loc - M.do_adrenaline(150, FALSE, 0, 0, TRUE, list("inaprovaline" = 3, "synaptizine" = 10, "omnizine" = 10), "You feel a sudden surge of energy!") + M.adjustStaminaLoss(-75) + M.SetUnconscious(0) + M.SetStun(0) + M.SetKnockdown(0) combat_cooldown = 0 START_PROCESSING(SSobj, src) @@ -131,9 +132,11 @@ /obj/item/abductor icon = 'icons/obj/abductor.dmi' + lefthand_file = 'icons/mob/inhands/antag/abductor_lefthand.dmi' + righthand_file = 'icons/mob/inhands/antag/abductor_righthand.dmi' /obj/item/abductor/proc/AbductorCheck(mob/user) - if(HAS_TRAIT(user, TRAIT_ABDUCTOR_TRAINING)) + if (HAS_TRAIT(user, TRAIT_ABDUCTOR_TRAINING)) return TRUE if (istype(user) && user.mind && HAS_TRAIT(user.mind, TRAIT_ABDUCTOR_TRAINING)) return TRUE @@ -158,8 +161,6 @@ desc = "A dual-mode tool for retrieving specimens and scanning appearances. Scanning can be done through cameras." icon_state = "gizmo_scan" item_state = "silencer" - lefthand_file = 'icons/mob/inhands/antag/abductor_lefthand.dmi' - righthand_file = 'icons/mob/inhands/antag/abductor_righthand.dmi' var/mode = GIZMO_SCAN var/mob/living/marked = null var/obj/machinery/abductor/console/console @@ -218,12 +219,9 @@ if(marked == target) to_chat(user, "This specimen is already marked!") return - if(ishuman(target)) - if(isabductor(target)) - marked = target - to_chat(user, "You mark [target] for future retrieval.") - else - prepare(target,user) + if(isabductor(target) || iscow(target)) + marked = target + to_chat(user, "You mark [target] for future retrieval.") else prepare(target,user) @@ -247,8 +245,6 @@ desc = "A compact device used to shut down communications equipment." icon_state = "silencer" item_state = "gizmo" - lefthand_file = 'icons/mob/inhands/antag/abductor_lefthand.dmi' - righthand_file = 'icons/mob/inhands/antag/abductor_righthand.dmi' /obj/item/abductor/silencer/attack(mob/living/M, mob/user) if(!AbductorCheck(user)) @@ -292,8 +288,6 @@ or to send a command to a test subject with a charged gland." icon_state = "mind_device_message" item_state = "silencer" - lefthand_file = 'icons/mob/inhands/antag/abductor_lefthand.dmi' - righthand_file = 'icons/mob/inhands/antag/abductor_righthand.dmi' var/mode = MIND_DEVICE_MESSAGE /obj/item/abductor/mind_device/attack_self(mob/user) @@ -389,6 +383,17 @@ item_state = "alienpistol" trigger_guard = TRIGGER_GUARD_ALLOW_ALL +/obj/item/gun/energy/shrink_ray + name = "shrink ray blaster" + desc = "This is a piece of frightening alien tech that enhances the magnetic pull of atoms in a localized space to temporarily make an object shrink. \ + That or it's just space magic. Either way, it shrinks stuff." + ammo_type = list(/obj/item/ammo_casing/energy/shrink) + item_state = "shrink_ray" + icon_state = "shrink_ray" + fire_delay = 30 + selfcharge = 1//shot costs 200 energy, has a max capacity of 1000 for 5 shots. self charge returns 25 energy every couple ticks, so about 1 shot charged every 12~ seconds + trigger_guard = TRIGGER_GUARD_ALLOW_ALL// variable-size trigger, get it? (abductors need this to be set so the gun is usable for them) + /obj/item/paper/guides/antag/abductor name = "Dissection Guide" icon_state = "alienpaper_words" @@ -422,21 +427,18 @@ #define BATON_PROBE 3 #define BATON_MODES 4 -/obj/item/abductor_baton +/obj/item/abductor/baton name = "advanced baton" desc = "A quad-mode baton used for incapacitation and restraining of specimens." var/mode = BATON_STUN - icon = 'icons/obj/abductor.dmi' icon_state = "wonderprodStun" item_state = "wonderprod" - lefthand_file = 'icons/mob/inhands/antag/abductor_lefthand.dmi' - righthand_file = 'icons/mob/inhands/antag/abductor_righthand.dmi' slot_flags = ITEM_SLOT_BELT force = 7 w_class = WEIGHT_CLASS_NORMAL actions_types = list(/datum/action/item_action/toggle_mode) -/obj/item/abductor_baton/proc/toggle(mob/living/user=usr) +/obj/item/abductor/baton/proc/toggle(mob/living/user=usr) mode = (mode+1)%BATON_MODES var/txt switch(mode) @@ -452,7 +454,7 @@ to_chat(usr, "You switch the baton to [txt] mode.") update_icon() -/obj/item/abductor_baton/update_icon() +/obj/item/abductor/baton/update_icon() switch(mode) if(BATON_STUN) icon_state = "wonderprodStun" @@ -467,8 +469,8 @@ icon_state = "wonderprodProbe" item_state = "wonderprodProbe" -/obj/item/abductor_baton/attack(mob/target, mob/living/user) - if(!isabductor(user)) +/obj/item/abductor/baton/attack(mob/target, mob/living/user) + if(!AbductorCheck(user)) return if(iscyborg(target)) @@ -485,8 +487,8 @@ if(ishuman(L)) var/mob/living/carbon/human/H = L if(H.check_shields(src, 0, "[user]'s [name]", MELEE_ATTACK)) - playsound(L, 'sound/weapons/genhit.ogg', 50, 1) - return 0 + playsound(H, 'sound/weapons/genhit.ogg', 50, TRUE) + return FALSE switch (mode) if(BATON_STUN) @@ -498,10 +500,10 @@ if(BATON_PROBE) ProbeAttack(L,user) -/obj/item/abductor_baton/attack_self(mob/living/user) +/obj/item/abductor/baton/attack_self(mob/living/user) toggle(user) -/obj/item/abductor_baton/proc/StunAttack(mob/living/L,mob/living/user) +/obj/item/abductor/baton/proc/StunAttack(mob/living/L,mob/living/user) L.lastattacker = user.real_name L.lastattackerckey = user.ckey @@ -513,7 +515,7 @@ L.visible_message("[user] has stunned [L] with [src]!", \ "[user] has stunned you with [src]!") - playsound(loc, 'sound/weapons/egloves.ogg', 50, 1, -1) + playsound(src, 'sound/weapons/egloves.ogg', 50, TRUE, -1) if(ishuman(L)) var/mob/living/carbon/human/H = L @@ -521,7 +523,7 @@ log_combat(user, L, "stunned") -/obj/item/abductor_baton/proc/SleepAttack(mob/living/L,mob/living/user) +/obj/item/abductor/baton/proc/SleepAttack(mob/living/L,mob/living/user) if(L.incapacitated(TRUE, TRUE)) if(L.anti_magic_check(FALSE, FALSE, TRUE, 0)) to_chat(user, "The specimen's tinfoil protection is interfering with the sleep inducement!") @@ -531,7 +533,7 @@ return L.visible_message("[user] has induced sleep in [L] with [src]!", \ "You suddenly feel very drowsy!") - playsound(loc, 'sound/weapons/egloves.ogg', 50, 1, -1) + playsound(src, 'sound/weapons/egloves.ogg', 50, TRUE, -1) L.Sleeping(1200) log_combat(user, L, "put to sleep") else @@ -545,13 +547,13 @@ L.visible_message("[user] tried to induce sleep in [L] with [src]!", \ "You suddenly feel drowsy!") -/obj/item/abductor_baton/proc/CuffAttack(mob/living/L,mob/living/user) +/obj/item/abductor/baton/proc/CuffAttack(mob/living/L,mob/living/user) if(!iscarbon(L)) return var/mob/living/carbon/C = L if(!C.handcuffed) if(C.get_num_arms(FALSE) >= 2 || C.get_arm_ignore()) - playsound(loc, 'sound/weapons/cablecuff.ogg', 30, 1, -2) + playsound(src, 'sound/weapons/cablecuff.ogg', 30, TRUE, -2) C.visible_message("[user] begins restraining [C] with [src]!", \ "[user] begins shaping an energy field around your hands!") if(do_mob(user, C, 30) && (C.get_num_arms(FALSE) >= 2 || C.get_arm_ignore())) @@ -565,7 +567,7 @@ else to_chat(user, "[C] doesn't have two hands...") -/obj/item/abductor_baton/proc/ProbeAttack(mob/living/L,mob/living/user) +/obj/item/abductor/baton/proc/ProbeAttack(mob/living/L,mob/living/user) L.visible_message("[user] probes [L] with [src]!", \ "[user] probes you!") @@ -610,7 +612,7 @@ S.start() . = ..() -/obj/item/abductor_baton/examine(mob/user) +/obj/item/abductor/baton/examine(mob/user) . = ..() switch(mode) if(BATON_STUN) @@ -639,10 +641,44 @@ AddComponent(/datum/component/wearertargeting/earprotection, list(SLOT_EARS)) /obj/item/radio/headset/abductor/attackby(obj/item/W, mob/user, params) - if(istype(W, /obj/item/screwdriver)) + if(W.tool_behaviour == TOOL_SCREWDRIVER) return // Stops humans from disassembling abductor headsets. return ..() +/obj/item/abductor_machine_beacon + name = "machine beacon" + desc = "A beacon designed to instantly tele-construct abductor machinery." + icon = 'icons/obj/abductor.dmi' + icon_state = "beacon" + w_class = WEIGHT_CLASS_TINY + var/obj/machinery/spawned_machine + +/obj/item/abductor_machine_beacon/attack_self(mob/user) + ..() + user.visible_message("[user] places down [src] and activates it.", "You place down [src] and activate it.") + user.dropItemToGround(src) + playsound(src, 'sound/machines/terminal_alert.ogg', 50) + addtimer(CALLBACK(src, .proc/try_spawn_machine), 30) + +/obj/item/abductor_machine_beacon/proc/try_spawn_machine() + var/viable = FALSE + if(isfloorturf(loc)) + var/turf/T = loc + viable = TRUE + for(var/obj/thing in T.contents) + if(thing.density || ismachinery(thing) || isstructure(thing)) + viable = FALSE + if(viable) + playsound(src, 'sound/effects/phasein.ogg', 50, TRUE) + var/new_machine = new spawned_machine(loc) + visible_message("[new_machine] warps on top of the beacon!") + qdel(src) + else + playsound(src, 'sound/machines/buzz-two.ogg', 50) + +/obj/item/abductor_machine_beacon/chem_dispenser + name = "beacon - Reagent Synthesizer" + spawned_machine = /obj/machinery/chem_dispenser/abductor /obj/item/scalpel/alien name = "alien scalpel" @@ -706,11 +742,11 @@ framestackamount = 1 /obj/structure/table_frame/abductor/attackby(obj/item/I, mob/user, params) - if(istype(I, /obj/item/wrench)) + if(I.tool_behaviour == TOOL_WRENCH) to_chat(user, "You start disassembling [src]...") I.play_tool_sound(src) if(I.use_tool(src, user, 30)) - playsound(src.loc, 'sound/items/deconstruct.ogg', 50, 1) + playsound(src, 'sound/items/deconstruct.ogg', 50, TRUE) for(var/i = 1, i <= framestackamount, i++) new framestack(get_turf(src)) qdel(src) @@ -760,7 +796,6 @@ icon = 'icons/obj/abductor.dmi' icon_state = "bed" can_buckle = 1 - buckle_lying = 1 var/static/list/injected_reagents = list("corazone") @@ -798,3 +833,11 @@ airlock_type = /obj/machinery/door/airlock/abductor material_type = /obj/item/stack/sheet/mineral/abductor noglass = TRUE + +/obj/item/clothing/under/abductor + desc = "The most advanced form of jumpsuit known to reality, looks uncomfortable." + name = "alien jumpsuit" + icon_state = "abductor" + item_state = "bl_suit" + armor = list(melee = 0, bullet = 0, laser = 0, energy = 0, bomb = 10, bio = 10, rad = 0, fire = 0, acid = 0) + can_adjust = 0 diff --git a/code/modules/antagonists/abductor/equipment/abduction_outfits.dm b/code/modules/antagonists/abductor/equipment/abduction_outfits.dm index 7bfadf6f3b..ec76f61ec6 100644 --- a/code/modules/antagonists/abductor/equipment/abduction_outfits.dm +++ b/code/modules/antagonists/abductor/equipment/abduction_outfits.dm @@ -1,6 +1,6 @@ /datum/outfit/abductor name = "Abductor Basic" - uniform = /obj/item/clothing/under/color/grey //they're greys gettit + uniform = /obj/item/clothing/under/abductor shoes = /obj/item/clothing/shoes/combat back = /obj/item/storage/backpack ears = /obj/item/radio/headset/abductor @@ -34,7 +34,7 @@ name = "Abductor Agent" head = /obj/item/clothing/head/helmet/abductor suit = /obj/item/clothing/suit/armor/abductor/vest - suit_store = /obj/item/abductor_baton + suit_store = /obj/item/abductor/baton belt = /obj/item/storage/belt/military/abductor/full backpack_contents = list( diff --git a/code/modules/antagonists/abductor/equipment/gland.dm b/code/modules/antagonists/abductor/equipment/gland.dm index f7b49e1cf4..82170444d0 100644 --- a/code/modules/antagonists/abductor/equipment/gland.dm +++ b/code/modules/antagonists/abductor/equipment/gland.dm @@ -5,18 +5,23 @@ icon_state = "gland" status = ORGAN_ROBOTIC beating = TRUE + organ_flags = ORGAN_NO_SPOIL var/true_name = "baseline placebo referencer" var/cooldown_low = 300 var/cooldown_high = 300 var/next_activation = 0 var/uses // -1 For infinite - var/human_only = 0 - var/active = 0 + var/human_only = FALSE + var/active = FALSE var/mind_control_uses = 1 var/mind_control_duration = 1800 var/active_mind_control = FALSE +/obj/item/organ/heart/gland/Initialize() + . = ..() + icon_state = pick(list("health", "spider", "slime", "emp", "species", "egg", "vent", "mindshock", "viral")) + /obj/item/organ/heart/gland/examine(mob/user) . = ..() if((user.mind && HAS_TRAIT(user.mind, TRAIT_ABDUCTOR_SCIENTIST_TRAINING)) || isobserver(user)) @@ -55,14 +60,18 @@ active_mind_control = TRUE message_admins("[key_name(user)] sent an abductor mind control message to [key_name(owner)]: [command]") update_gland_hud() - + var/obj/screen/alert/mind_control/mind_alert = owner.throw_alert("mind_control", /obj/screen/alert/mind_control) + mind_alert.command = command addtimer(CALLBACK(src, .proc/clear_mind_control), mind_control_duration) + return TRUE /obj/item/organ/heart/gland/proc/clear_mind_control() if(!ownerCheck() || !active_mind_control) return FALSE - to_chat(owner, "You feel the compulsion fade, and you completely forget about your previous orders.") + to_chat(owner, "You feel the compulsion fade, and you completely forget about your previous orders.") + owner.clear_alert("mind_control") active_mind_control = FALSE + return TRUE /obj/item/organ/heart/gland/Remove(mob/living/carbon/M, special = 0) active = 0 @@ -98,257 +107,4 @@ active = 0 /obj/item/organ/heart/gland/proc/activate() - return - -/obj/item/organ/heart/gland/heals - true_name = "coherency harmonizer" - cooldown_low = 200 - cooldown_high = 400 - uses = -1 - icon_state = "health" - mind_control_uses = 3 - mind_control_duration = 3000 - -/obj/item/organ/heart/gland/heals/activate() - to_chat(owner, "You feel curiously revitalized.") - owner.adjustToxLoss(-20, FALSE, TRUE) - owner.heal_bodypart_damage(20, 20, 0, TRUE) - owner.adjustOxyLoss(-20) - -/obj/item/organ/heart/gland/slime - true_name = "gastric animation galvanizer" - cooldown_low = 600 - cooldown_high = 1200 - uses = -1 - icon_state = "slime" - mind_control_uses = 1 - mind_control_duration = 2400 - -/obj/item/organ/heart/gland/slime/Insert(mob/living/carbon/M, special = 0, drop_if_replaced = TRUE) - ..() - owner.faction |= "slime" - owner.grant_language(/datum/language/slime) - -/obj/item/organ/heart/gland/slime/activate() - to_chat(owner, "You feel nauseated!") - owner.vomit(20) - - var/mob/living/simple_animal/slime/Slime = new(get_turf(owner), "grey") - Slime.Friends = list(owner) - Slime.Leader = owner - -/obj/item/organ/heart/gland/mindshock - true_name = "neural crosstalk uninhibitor" - cooldown_low = 400 - cooldown_high = 700 - uses = -1 - icon_state = "mindshock" - mind_control_uses = 1 - mind_control_duration = 6000 - -/obj/item/organ/heart/gland/mindshock/activate() - to_chat(owner, "You get a headache.") - - var/turf/T = get_turf(owner) - for(var/mob/living/carbon/H in orange(4,T)) - if(H == owner) - continue - switch(pick(1,3)) - if(1) - to_chat(H, "You hear a loud buzz in your head, silencing your thoughts!") - H.Stun(50) - if(2) - to_chat(H, "You hear an annoying buzz in your head.") - H.confused += 15 - H.adjustOrganLoss(ORGAN_SLOT_BRAIN, 10, 160) - if(3) - H.hallucination += 60 - -/obj/item/organ/heart/gland/pop - true_name = "anthropmorphic translocator" - cooldown_low = 900 - cooldown_high = 1800 - uses = -1 - human_only = TRUE - icon_state = "species" - mind_control_uses = 5 - mind_control_duration = 300 - -/obj/item/organ/heart/gland/pop/activate() - to_chat(owner, "You feel unlike yourself.") - randomize_human(owner) - var/species = pick(list(/datum/species/human, /datum/species/lizard, /datum/species/insect, /datum/species/fly)) - owner.set_species(species) - -/obj/item/organ/heart/gland/ventcrawling - true_name = "pliant cartilage enabler" - cooldown_low = 1800 - cooldown_high = 2400 - uses = 1 - icon_state = "vent" - mind_control_uses = 4 - mind_control_duration = 1800 - -/obj/item/organ/heart/gland/ventcrawling/activate() - to_chat(owner, "You feel very stretchy.") - owner.ventcrawler = VENTCRAWLER_ALWAYS - -/obj/item/organ/heart/gland/viral - true_name = "contamination incubator" - cooldown_low = 1800 - cooldown_high = 2400 - uses = 1 - icon_state = "viral" - mind_control_uses = 1 - mind_control_duration = 1800 - -/obj/item/organ/heart/gland/viral/activate() - to_chat(owner, "You feel sick.") - var/datum/disease/advance/A = random_virus(pick(2,6),6) - A.carrier = TRUE - owner.ForceContractDisease(A, FALSE, TRUE) - -/obj/item/organ/heart/gland/viral/proc/random_virus(max_symptoms, max_level) - if(max_symptoms > VIRUS_SYMPTOM_LIMIT) - max_symptoms = VIRUS_SYMPTOM_LIMIT - var/datum/disease/advance/A = new /datum/disease/advance() - var/list/datum/symptom/possible_symptoms = list() - for(var/symptom in subtypesof(/datum/symptom)) - var/datum/symptom/S = symptom - if(initial(S.level) > max_level) - continue - if(initial(S.level) <= 0) //unobtainable symptoms - continue - possible_symptoms += S - for(var/i in 1 to max_symptoms) - var/datum/symptom/chosen_symptom = pick_n_take(possible_symptoms) - if(chosen_symptom) - var/datum/symptom/S = new chosen_symptom - A.symptoms += S - A.Refresh() //just in case someone already made and named the same disease - return A - -/obj/item/organ/heart/gland/trauma - true_name = "white matter randomiser" - cooldown_low = 800 - cooldown_high = 1200 - uses = 5 - icon_state = "emp" - mind_control_uses = 3 - mind_control_duration = 1800 - -/obj/item/organ/heart/gland/trauma/activate() - to_chat(owner, "You feel a spike of pain in your head.") - if(prob(33)) - owner.gain_trauma_type(BRAIN_TRAUMA_SPECIAL, rand(TRAUMA_RESILIENCE_BASIC, TRAUMA_RESILIENCE_LOBOTOMY)) - else - if(prob(20)) - owner.gain_trauma_type(BRAIN_TRAUMA_SEVERE, rand(TRAUMA_RESILIENCE_BASIC, TRAUMA_RESILIENCE_LOBOTOMY)) - else - owner.gain_trauma_type(BRAIN_TRAUMA_MILD, rand(TRAUMA_RESILIENCE_BASIC, TRAUMA_RESILIENCE_LOBOTOMY)) - -/obj/item/organ/heart/gland/spiderman - true_name = "araneae cloister accelerator" - cooldown_low = 450 - cooldown_high = 900 - uses = -1 - icon_state = "spider" - mind_control_uses = 2 - mind_control_duration = 2400 - -/obj/item/organ/heart/gland/spiderman/activate() - to_chat(owner, "You feel something crawling in your skin.") - owner.faction |= "spiders" - var/obj/structure/spider/spiderling/S = new(owner.drop_location()) - S.directive = "Protect your nest inside [owner.real_name]." - -/obj/item/organ/heart/gland/egg - true_name = "roe/enzymatic synthesizer" - cooldown_low = 300 - cooldown_high = 400 - uses = -1 - icon_state = "egg" - lefthand_file = 'icons/mob/inhands/misc/food_lefthand.dmi' - righthand_file = 'icons/mob/inhands/misc/food_righthand.dmi' - mind_control_uses = 2 - mind_control_duration = 1800 - -/obj/item/organ/heart/gland/egg/activate() - owner.visible_message("[owner] [pick(EGG_LAYING_MESSAGES)]") - var/turf/T = owner.drop_location() - new /obj/item/reagent_containers/food/snacks/egg/gland(T) - -/obj/item/organ/heart/gland/electric - true_name = "electron accumulator/discharger" - cooldown_low = 800 - cooldown_high = 1200 - uses = -1 - mind_control_uses = 2 - mind_control_duration = 900 - -/obj/item/organ/heart/gland/electric/Insert(mob/living/carbon/M, special = 0, drop_if_replaced = TRUE) - ..() - ADD_TRAIT(owner, TRAIT_SHOCKIMMUNE, ORGAN_TRAIT) - -/obj/item/organ/heart/gland/electric/Remove(mob/living/carbon/M, special = 0) - REMOVE_TRAIT(owner, TRAIT_SHOCKIMMUNE, ORGAN_TRAIT) - ..() - -/obj/item/organ/heart/gland/electric/activate() - owner.visible_message("[owner]'s skin starts emitting electric arcs!",\ - "You feel electric energy building up inside you!") - playsound(get_turf(owner), "sparks", 100, 1, -1) - addtimer(CALLBACK(src, .proc/zap), rand(30, 100)) - -/obj/item/organ/heart/gland/electric/proc/zap() - tesla_zap(owner, 4, 8000, TESLA_MOB_DAMAGE | TESLA_OBJ_DAMAGE | TESLA_MOB_STUN) - playsound(get_turf(owner), 'sound/magic/lightningshock.ogg', 50, 1) - -/obj/item/organ/heart/gland/chem - true_name = "intrinsic pharma-provider" - cooldown_low = 50 - cooldown_high = 50 - uses = -1 - mind_control_uses = 3 - mind_control_duration = 1200 - var/list/possible_reagents = list() - -/obj/item/organ/heart/gland/chem/Initialize() - ..() - for(var/X in subtypesof(/datum/reagent/drug)) - var/datum/reagent/R = X - possible_reagents += initial(R.id) - for(var/X in subtypesof(/datum/reagent/medicine)) - var/datum/reagent/R = X - possible_reagents += initial(R.id) - for(var/X in typesof(/datum/reagent/toxin)) - var/datum/reagent/R = X - possible_reagents += initial(R.id) - -/obj/item/organ/heart/gland/chem/activate() - var/chem_to_add = pick(possible_reagents) - owner.reagents.add_reagent(chem_to_add, 2) - owner.adjustToxLoss(-2, TRUE, TRUE) - ..() - -/obj/item/organ/heart/gland/plasma - true_name = "effluvium sanguine-synonym emitter" - cooldown_low = 1200 - cooldown_high = 1800 - uses = -1 - mind_control_uses = 1 - mind_control_duration = 800 - -/obj/item/organ/heart/gland/plasma/activate() - to_chat(owner, "You feel bloated.") - addtimer(CALLBACK(GLOBAL_PROC, .proc/to_chat, owner, "A massive stomachache overcomes you."), 150) - addtimer(CALLBACK(src, .proc/vomit_plasma), 200) - -/obj/item/organ/heart/gland/plasma/proc/vomit_plasma() - if(!owner) - return - owner.visible_message("[owner] vomits a cloud of plasma!") - var/turf/open/T = get_turf(owner) - if(istype(T)) - T.atmos_spawn_air("plasma=50;TEMP=[T20C]") - owner.vomit() + return \ No newline at end of file diff --git a/code/modules/antagonists/abductor/equipment/glands/access.dm b/code/modules/antagonists/abductor/equipment/glands/access.dm new file mode 100644 index 0000000000..548650d4e3 --- /dev/null +++ b/code/modules/antagonists/abductor/equipment/glands/access.dm @@ -0,0 +1,19 @@ +/obj/item/organ/heart/gland/access + true_name = "anagraphic electro-scrambler" + cooldown_low = 600 + cooldown_high = 1200 + uses = 1 + icon_state = "mindshock" + mind_control_uses = 3 + mind_control_duration = 900 + +/obj/item/organ/heart/gland/access/activate() + to_chat(owner, "You feel like a VIP for some reason.") + RegisterSignal(owner, COMSIG_MOB_ALLOWED, .proc/free_access) + +/obj/item/organ/heart/gland/access/proc/free_access(datum/source, obj/O) + return TRUE + +/obj/item/organ/heart/gland/access/Remove(mob/living/carbon/M, special = 0) + UnregisterSignal(owner, COMSIG_MOB_ALLOWED) + ..() \ No newline at end of file diff --git a/code/modules/antagonists/abductor/equipment/glands/blood.dm b/code/modules/antagonists/abductor/equipment/glands/blood.dm new file mode 100644 index 0000000000..06b8249484 --- /dev/null +++ b/code/modules/antagonists/abductor/equipment/glands/blood.dm @@ -0,0 +1,18 @@ +/obj/item/organ/heart/gland/blood + true_name = "pseudonuclear hemo-destabilizer" + cooldown_low = 1200 + cooldown_high = 1800 + uses = -1 + icon_state = "egg" + lefthand_file = 'icons/mob/inhands/misc/food_lefthand.dmi' + righthand_file = 'icons/mob/inhands/misc/food_righthand.dmi' + mind_control_uses = 3 + mind_control_duration = 1500 + +/obj/item/organ/heart/gland/blood/activate() + if(!ishuman(owner) || !owner.dna.species) + return + var/mob/living/carbon/human/H = owner + var/datum/species/species = H.dna.species + to_chat(H, "You feel your blood heat up for a moment.") + species.exotic_blood = get_random_reagent_id() \ No newline at end of file diff --git a/code/modules/antagonists/abductor/equipment/glands/chem.dm b/code/modules/antagonists/abductor/equipment/glands/chem.dm new file mode 100644 index 0000000000..e7b6fda85f --- /dev/null +++ b/code/modules/antagonists/abductor/equipment/glands/chem.dm @@ -0,0 +1,20 @@ +/obj/item/organ/heart/gland/chem + true_name = "intrinsic pharma-provider" + cooldown_low = 50 + cooldown_high = 50 + uses = -1 + icon_state = "viral" + mind_control_uses = 3 + mind_control_duration = 1200 + var/list/possible_reagents = list() + +/obj/item/organ/heart/gland/chem/Initialize() + . = ..() + for(var/R in subtypesof(/datum/reagent/drug) + subtypesof(/datum/reagent/medicine) + typesof(/datum/reagent/toxin)) + possible_reagents += R + +/obj/item/organ/heart/gland/chem/activate() + var/chem_to_add = pick(possible_reagents) + owner.reagents.add_reagent(chem_to_add, 2) + owner.adjustToxLoss(-5, TRUE, TRUE) + ..() \ No newline at end of file diff --git a/code/modules/antagonists/abductor/equipment/glands/egg.dm b/code/modules/antagonists/abductor/equipment/glands/egg.dm new file mode 100644 index 0000000000..429a24b19c --- /dev/null +++ b/code/modules/antagonists/abductor/equipment/glands/egg.dm @@ -0,0 +1,15 @@ +/obj/item/organ/heart/gland/egg + true_name = "roe/enzymatic synthesizer" + cooldown_low = 300 + cooldown_high = 400 + uses = -1 + icon_state = "egg" + lefthand_file = 'icons/mob/inhands/misc/food_lefthand.dmi' + righthand_file = 'icons/mob/inhands/misc/food_righthand.dmi' + mind_control_uses = 2 + mind_control_duration = 1800 + +/obj/item/organ/heart/gland/egg/activate() + owner.visible_message("[owner] [pick(EGG_LAYING_MESSAGES)]") + var/turf/T = owner.drop_location() + new /obj/item/reagent_containers/food/snacks/egg/gland(T) \ No newline at end of file diff --git a/code/modules/antagonists/abductor/equipment/glands/electric.dm b/code/modules/antagonists/abductor/equipment/glands/electric.dm new file mode 100644 index 0000000000..63d95f8b1f --- /dev/null +++ b/code/modules/antagonists/abductor/equipment/glands/electric.dm @@ -0,0 +1,26 @@ +/obj/item/organ/heart/gland/electric + true_name = "electron accumulator/discharger" + cooldown_low = 800 + cooldown_high = 1200 + icon_state = "species" + uses = -1 + mind_control_uses = 2 + mind_control_duration = 900 + +/obj/item/organ/heart/gland/electric/Insert(mob/living/carbon/M, special = 0, drop_if_replaced = TRUE) + ..() + ADD_TRAIT(owner, TRAIT_SHOCKIMMUNE, "abductor_gland") + +/obj/item/organ/heart/gland/electric/Remove(mob/living/carbon/M, special = 0) + REMOVE_TRAIT(owner, TRAIT_SHOCKIMMUNE, "abductor_gland") + ..() + +/obj/item/organ/heart/gland/electric/activate() + owner.visible_message("[owner]'s skin starts emitting electric arcs!",\ + "You feel electric energy building up inside you!") + playsound(get_turf(owner), "sparks", 100, TRUE, -1) + addtimer(CALLBACK(src, .proc/zap), rand(30, 100)) + +/obj/item/organ/heart/gland/electric/proc/zap() + tesla_zap(owner, 4, 8000, TESLA_MOB_DAMAGE | TESLA_OBJ_DAMAGE | TESLA_MOB_STUN) + playsound(get_turf(owner), 'sound/magic/lightningshock.ogg', 50, TRUE) \ No newline at end of file diff --git a/code/modules/antagonists/abductor/equipment/glands/heal.dm b/code/modules/antagonists/abductor/equipment/glands/heal.dm new file mode 100644 index 0000000000..bf9a00e13c --- /dev/null +++ b/code/modules/antagonists/abductor/equipment/glands/heal.dm @@ -0,0 +1,178 @@ +/obj/item/organ/heart/gland/heal + true_name = "organic replicator" + cooldown_low = 200 + cooldown_high = 400 + uses = -1 + human_only = TRUE + icon_state = "health" + mind_control_uses = 3 + mind_control_duration = 3000 + +/obj/item/organ/heart/gland/heal/activate() + if(!(owner.mob_biotypes & MOB_ORGANIC)) + return + + for(var/organ in owner.internal_organs) + if(istype(organ, /obj/item/organ/cyberimp)) + reject_implant(organ) + return + + var/obj/item/organ/liver/liver = owner.getorganslot(ORGAN_SLOT_LIVER) + if((!liver/* && !HAS_TRAIT(owner, TRAIT_NOMETABOLISM)*/) || (liver && ((liver.damage > (liver.maxHealth / 2)) || (istype(liver, /obj/item/organ/liver/cybernetic))))) + replace_liver(liver) + return + + var/obj/item/organ/lungs/lungs = owner.getorganslot(ORGAN_SLOT_LUNGS) + if((!lungs && !HAS_TRAIT(owner, TRAIT_NOBREATH)) || (lungs && (istype(lungs, /obj/item/organ/lungs/cybernetic)))) + replace_lungs(lungs) + return + + var/obj/item/organ/eyes/eyes = owner.getorganslot(ORGAN_SLOT_EYES) + if(!eyes || (eyes && ((HAS_TRAIT_FROM(owner, TRAIT_NEARSIGHT, EYE_DAMAGE)) || (HAS_TRAIT_FROM(owner, TRAIT_BLIND, EYE_DAMAGE)) || (istype(eyes, /obj/item/organ/eyes/robotic))))) + replace_eyes(eyes) + return + + var/obj/item/bodypart/limb + var/list/limb_list = list(BODY_ZONE_L_ARM, BODY_ZONE_R_ARM, BODY_ZONE_L_LEG, BODY_ZONE_R_LEG) + for(var/zone in limb_list) + limb = owner.get_bodypart(zone) + if(!limb) + replace_limb(zone) + return + if((limb.get_damage() >= (limb.max_damage / 2)) || (limb.status == BODYPART_ROBOTIC)) + replace_limb(zone, limb) + return + + if(owner.getToxLoss() > 40) + replace_blood() + return + var/tox_amount = 0 + for(var/datum/reagent/toxin/T in owner.reagents.reagent_list) + tox_amount += owner.reagents.get_reagent_amount(T.type) + if(tox_amount > 10) + replace_blood() + return + if(owner.blood_volume < BLOOD_VOLUME_OKAY) + owner.blood_volume = BLOOD_VOLUME_NORMAL + to_chat(owner, "You feel your blood pulsing within you.") + return + + var/obj/item/bodypart/chest/chest = owner.get_bodypart(BODY_ZONE_CHEST) + if((chest.get_damage() >= (chest.max_damage / 4)) || (chest.status == BODYPART_ROBOTIC)) + replace_chest(chest) + return + +/obj/item/organ/heart/gland/heal/proc/reject_implant(obj/item/organ/cyberimp/implant) + owner.visible_message("[owner] vomits up his [implant.name]!", "You suddenly vomit up your [implant.name]!") + owner.vomit(0, TRUE, TRUE, 1, FALSE, FALSE, FALSE, TRUE) + implant.Remove(owner) + implant.forceMove(owner.drop_location()) + +/obj/item/organ/heart/gland/heal/proc/replace_liver(obj/item/organ/liver/liver) + if(liver) + owner.visible_message("[owner] vomits up his [liver.name]!", "You suddenly vomit up your [liver.name]!") + owner.vomit(0, TRUE, TRUE, 1, FALSE, FALSE, FALSE, TRUE) + liver.Remove(owner) + liver.forceMove(owner.drop_location()) + else + to_chat(owner, "You feel a weird rumble in your bowels...") + + var/liver_type = /obj/item/organ/liver + if(owner?.dna?.species?.mutantliver) + liver_type = owner.dna.species.mutantliver + var/obj/item/organ/liver/new_liver = new liver_type() + new_liver.Insert(owner) + +/obj/item/organ/heart/gland/heal/proc/replace_lungs(obj/item/organ/lungs/lungs) + if(lungs) + owner.visible_message("[owner] vomits up his [lungs.name]!", "You suddenly vomit up your [lungs.name]!") + owner.vomit(0, TRUE, TRUE, 1, FALSE, FALSE, FALSE, TRUE) + lungs.Remove(owner) + lungs.forceMove(owner.drop_location()) + else + to_chat(owner, "You feel a weird rumble inside your chest...") + + var/lung_type = /obj/item/organ/lungs + if(owner.dna.species && owner.dna.species.mutantlungs) + lung_type = owner.dna.species.mutantlungs + var/obj/item/organ/lungs/new_lungs = new lung_type() + new_lungs.Insert(owner) + +/obj/item/organ/heart/gland/heal/proc/replace_eyes(obj/item/organ/eyes/eyes) + if(eyes) + owner.visible_message("[owner]'s [eyes.name] fall out of their sockets!", "Your [eyes.name] fall out of their sockets!") + playsound(owner, 'sound/effects/splat.ogg', 50, TRUE) + eyes.Remove(owner) + eyes.forceMove(owner.drop_location()) + else + to_chat(owner, "You feel a weird rumble behind your eye sockets...") + + addtimer(CALLBACK(src, .proc/finish_replace_eyes), rand(100, 200)) + +/obj/item/organ/heart/gland/heal/proc/finish_replace_eyes() + var/eye_type = /obj/item/organ/eyes + if(owner.dna.species && owner.dna.species.mutanteyes) + eye_type = owner.dna.species.mutanteyes + var/obj/item/organ/eyes/new_eyes = new eye_type() + new_eyes.Insert(owner) + owner.visible_message("A pair of new eyes suddenly inflates into [owner]'s eye sockets!", "A pair of new eyes suddenly inflates into your eye sockets!") + +/obj/item/organ/heart/gland/heal/proc/replace_limb(body_zone, obj/item/bodypart/limb) + if(limb) + owner.visible_message("[owner]'s [limb.name] suddenly detaches from [owner.p_their()] body!", "Your [limb.name] suddenly detaches from your body!") + playsound(owner, "desceration", 50, TRUE, -1) + limb.drop_limb() + else + to_chat(owner, "You feel a weird tingle in your [parse_zone(body_zone)]... even if you don't have one.") + + addtimer(CALLBACK(src, .proc/finish_replace_limb, body_zone), rand(150, 300)) + +/obj/item/organ/heart/gland/heal/proc/finish_replace_limb(body_zone) + owner.visible_message("With a loud snap, [owner]'s [parse_zone(body_zone)] rapidly grows back from [owner.p_their()] body!", + "With a loud snap, your [parse_zone(body_zone)] rapidly grows back from your body!", + "Your hear a loud snap.") + playsound(owner, 'sound/magic/demon_consume.ogg', 50, TRUE) + owner.regenerate_limb(body_zone) + +/obj/item/organ/heart/gland/heal/proc/replace_blood() + owner.visible_message("[owner] starts vomiting huge amounts of blood!", "You suddenly start vomiting huge amounts of blood!") + keep_replacing_blood() + +/obj/item/organ/heart/gland/heal/proc/keep_replacing_blood() + var/keep_going = FALSE + owner.vomit(0, TRUE, FALSE, 3, FALSE, FALSE, FALSE, TRUE) + owner.Stun(15) + owner.adjustToxLoss(-15, TRUE, TRUE) + + owner.blood_volume = min(BLOOD_VOLUME_NORMAL, owner.blood_volume + 20) + if(owner.blood_volume < BLOOD_VOLUME_NORMAL) + keep_going = TRUE + + if(owner.getToxLoss()) + keep_going = TRUE + for(var/datum/reagent/toxin/R in owner.reagents.reagent_list) + owner.reagents.remove_reagent(R.type, 4) + if(owner.reagents.has_reagent(R.type)) + keep_going = TRUE + if(keep_going) + addtimer(CALLBACK(src, .proc/keep_replacing_blood), 30) + +/obj/item/organ/heart/gland/heal/proc/replace_chest(obj/item/bodypart/chest/chest) + if(chest.status == BODYPART_ROBOTIC) + owner.visible_message("[owner]'s [chest.name] rapidly expels its mechanical components, replacing them with flesh!", "Your [chest.name] rapidly expels its mechanical components, replacing them with flesh!") + playsound(owner, 'sound/magic/clockwork/anima_fragment_attack.ogg', 50, TRUE) + var/list/dirs = GLOB.alldirs.Copy() + for(var/i in 1 to 3) + var/obj/effect/decal/cleanable/robot_debris/debris = new(get_turf(owner)) + debris.streak(dirs) + else + owner.visible_message("[owner]'s [chest.name] sheds off its damaged flesh, rapidly replacing it!", "Your [chest.name] sheds off its damaged flesh, rapidly replacing it!") + playsound(owner, 'sound/effects/splat.ogg', 50, TRUE) + var/list/dirs = GLOB.alldirs.Copy() + for(var/i in 1 to 3) + var/obj/effect/decal/cleanable/blood/gibs/gibs = new(get_turf(owner)) + gibs.streak(dirs) + + var/obj/item/bodypart/chest/new_chest = new(null) + new_chest.replace_limb(owner, TRUE) + qdel(chest) \ No newline at end of file diff --git a/code/modules/antagonists/abductor/equipment/glands/mindshock.dm b/code/modules/antagonists/abductor/equipment/glands/mindshock.dm new file mode 100644 index 0000000000..f8b91343f2 --- /dev/null +++ b/code/modules/antagonists/abductor/equipment/glands/mindshock.dm @@ -0,0 +1,64 @@ +/obj/item/organ/heart/gland/mindshock + true_name = "neural crosstalk uninhibitor" + cooldown_low = 400 + cooldown_high = 700 + uses = -1 + icon_state = "mindshock" + mind_control_uses = 1 + mind_control_duration = 6000 + var/list/mob/living/carbon/human/broadcasted_mobs = list() + +/obj/item/organ/heart/gland/mindshock/activate() + to_chat(owner, "You get a headache.") + + var/turf/T = get_turf(owner) + for(var/mob/living/carbon/H in orange(4,T)) + if(H == owner) + continue + switch(pick(1,3)) + if(1) + to_chat(H, "You hear a loud buzz in your head, silencing your thoughts!") + H.Stun(50) + if(2) + to_chat(H, "You hear an annoying buzz in your head.") + H.confused += 15 + H.adjustOrganLoss(ORGAN_SLOT_BRAIN, 10, 160) + if(3) + H.hallucination += 60 + +/obj/item/organ/heart/gland/mindshock/mind_control(command, mob/living/user) + if(!ownerCheck() || !mind_control_uses || active_mind_control) + return FALSE + mind_control_uses-- + for(var/mob/M in oview(7, owner)) + if(!ishuman(M)) + continue + var/mob/living/carbon/human/H = M + if(H.stat) + continue + + broadcasted_mobs += H + to_chat(H, "You suddenly feel an irresistible compulsion to follow an order...") + to_chat(H, "[command]") + + message_admins("[key_name(user)] broadcasted an abductor mind control message from [key_name(owner)] to [key_name(H)]: [command]") + + var/obj/screen/alert/mind_control/mind_alert = H.throw_alert("mind_control", /obj/screen/alert/mind_control) + mind_alert.command = command + + if(LAZYLEN(broadcasted_mobs)) + active_mind_control = TRUE + addtimer(CALLBACK(src, .proc/clear_mind_control), mind_control_duration) + + update_gland_hud() + return TRUE + +/obj/item/organ/heart/gland/mindshock/clear_mind_control() + if(!active_mind_control || !LAZYLEN(broadcasted_mobs)) + return FALSE + for(var/M in broadcasted_mobs) + var/mob/living/carbon/human/H = M + to_chat(H, "You feel the compulsion fade, and you completely forget about your previous orders.") + H.clear_alert("mind_control") + active_mind_control = FALSE + return TRUE \ No newline at end of file diff --git a/code/modules/antagonists/abductor/equipment/glands/plasma.dm b/code/modules/antagonists/abductor/equipment/glands/plasma.dm new file mode 100644 index 0000000000..4a30d99d44 --- /dev/null +++ b/code/modules/antagonists/abductor/equipment/glands/plasma.dm @@ -0,0 +1,22 @@ +/obj/item/organ/heart/gland/plasma + true_name = "effluvium sanguine-synonym emitter" + cooldown_low = 1200 + cooldown_high = 1800 + icon_state = "slime" + uses = -1 + mind_control_uses = 1 + mind_control_duration = 800 + +/obj/item/organ/heart/gland/plasma/activate() + to_chat(owner, "You feel bloated.") + addtimer(CALLBACK(GLOBAL_PROC, .proc/to_chat, owner, "A massive stomachache overcomes you."), 150) + addtimer(CALLBACK(src, .proc/vomit_plasma), 200) + +/obj/item/organ/heart/gland/plasma/proc/vomit_plasma() + if(!owner) + return + owner.visible_message("[owner] vomits a cloud of plasma!") + var/turf/open/T = get_turf(owner) + if(istype(T)) + T.atmos_spawn_air("plasma=50;TEMP=[T20C]") + owner.vomit() \ No newline at end of file diff --git a/code/modules/antagonists/abductor/equipment/glands/quantum.dm b/code/modules/antagonists/abductor/equipment/glands/quantum.dm new file mode 100644 index 0000000000..a5b8815437 --- /dev/null +++ b/code/modules/antagonists/abductor/equipment/glands/quantum.dm @@ -0,0 +1,47 @@ +/obj/item/organ/heart/gland/quantum + true_name = "quantic de-observation matrix" + cooldown_low = 150 + cooldown_high = 150 + uses = -1 + icon_state = "emp" + mind_control_uses = 2 + mind_control_duration = 1200 + var/mob/living/carbon/entangled_mob + +/obj/item/organ/heart/gland/quantum/activate() + if(entangled_mob) + return + for(var/mob/M in oview(owner, 7)) + if(!iscarbon(M)) + continue + entangled_mob = M + addtimer(CALLBACK(src, .proc/quantum_swap), rand(600, 2400)) + return + +/obj/item/organ/heart/gland/quantum/proc/quantum_swap() + if(QDELETED(entangled_mob)) + entangled_mob = null + return + var/turf/T = get_turf(owner) + do_teleport(owner, get_turf(entangled_mob),null,TRUE,channel = TELEPORT_CHANNEL_QUANTUM) + do_teleport(entangled_mob, T,null,TRUE,channel = TELEPORT_CHANNEL_QUANTUM) + to_chat(owner, "You suddenly find yourself somewhere else!") + to_chat(entangled_mob, "You suddenly find yourself somewhere else!") + if(!active_mind_control) //Do not reset entangled mob while mind control is active + entangled_mob = null + +/obj/item/organ/heart/gland/quantum/mind_control(command, mob/living/user) + if(..()) + if(entangled_mob && ishuman(entangled_mob) && (entangled_mob.stat < DEAD)) + to_chat(entangled_mob, "You suddenly feel an irresistible compulsion to follow an order...") + to_chat(entangled_mob, "[command]") + var/obj/screen/alert/mind_control/mind_alert = entangled_mob.throw_alert("mind_control", /obj/screen/alert/mind_control) + mind_alert.command = command + message_admins("[key_name(owner)] mirrored an abductor mind control message to [key_name(entangled_mob)]: [command]") + update_gland_hud() + +/obj/item/organ/heart/gland/quantum/clear_mind_control() + if(active_mind_control) + to_chat(entangled_mob, "You feel the compulsion fade, and you completely forget about your previous orders.") + entangled_mob.clear_alert("mind_control") + ..() \ No newline at end of file diff --git a/code/modules/antagonists/abductor/equipment/glands/slime.dm b/code/modules/antagonists/abductor/equipment/glands/slime.dm new file mode 100644 index 0000000000..53b8133528 --- /dev/null +++ b/code/modules/antagonists/abductor/equipment/glands/slime.dm @@ -0,0 +1,21 @@ +/obj/item/organ/heart/gland/slime + true_name = "gastric animation galvanizer" + cooldown_low = 600 + cooldown_high = 1200 + uses = -1 + icon_state = "slime" + mind_control_uses = 1 + mind_control_duration = 2400 + +/obj/item/organ/heart/gland/slime/Insert(mob/living/carbon/M, special = 0, drop_if_replaced = TRUE) + ..() + owner.faction |= "slime" + owner.grant_language(/datum/language/slime) + +/obj/item/organ/heart/gland/slime/activate() + to_chat(owner, "You feel nauseated!") + owner.vomit(20) + + var/mob/living/simple_animal/slime/Slime = new(get_turf(owner), "grey") + Slime.Friends = list(owner) + Slime.Leader = owner \ No newline at end of file diff --git a/code/modules/antagonists/abductor/equipment/glands/spider.dm b/code/modules/antagonists/abductor/equipment/glands/spider.dm new file mode 100644 index 0000000000..f0421b23b2 --- /dev/null +++ b/code/modules/antagonists/abductor/equipment/glands/spider.dm @@ -0,0 +1,14 @@ +/obj/item/organ/heart/gland/spiderman + true_name = "araneae cloister accelerator" + cooldown_low = 450 + cooldown_high = 900 + uses = -1 + icon_state = "spider" + mind_control_uses = 2 + mind_control_duration = 2400 + +/obj/item/organ/heart/gland/spiderman/activate() + to_chat(owner, "You feel something crawling in your skin.") + owner.faction |= "spiders" + var/obj/structure/spider/spiderling/S = new(owner.drop_location()) + S.directive = "Protect your nest inside [owner.real_name]." \ No newline at end of file diff --git a/code/modules/antagonists/abductor/equipment/glands/transform.dm b/code/modules/antagonists/abductor/equipment/glands/transform.dm new file mode 100644 index 0000000000..05c4760d37 --- /dev/null +++ b/code/modules/antagonists/abductor/equipment/glands/transform.dm @@ -0,0 +1,15 @@ +/obj/item/organ/heart/gland/transform + true_name = "anthropmorphic transmorphosizer" + cooldown_low = 900 + cooldown_high = 1800 + uses = -1 + human_only = TRUE + icon_state = "species" + mind_control_uses = 7 + mind_control_duration = 300 + +/obj/item/organ/heart/gland/transform/activate() + to_chat(owner, "You feel unlike yourself.") + randomize_human(owner) + var/species = pick(list(/datum/species/human, /datum/species/lizard, /datum/species/insect, /datum/species/fly)) + owner.set_species(species) \ No newline at end of file diff --git a/code/modules/antagonists/abductor/equipment/glands/trauma.dm b/code/modules/antagonists/abductor/equipment/glands/trauma.dm new file mode 100644 index 0000000000..b6280ec017 --- /dev/null +++ b/code/modules/antagonists/abductor/equipment/glands/trauma.dm @@ -0,0 +1,18 @@ +/obj/item/organ/heart/gland/trauma + true_name = "white matter randomiser" + cooldown_low = 800 + cooldown_high = 1200 + uses = 5 + icon_state = "emp" + mind_control_uses = 3 + mind_control_duration = 1800 + +/obj/item/organ/heart/gland/trauma/activate() + to_chat(owner, "You feel a spike of pain in your head.") + if(prob(33)) + owner.gain_trauma_type(BRAIN_TRAUMA_SPECIAL, rand(TRAUMA_RESILIENCE_BASIC, TRAUMA_RESILIENCE_LOBOTOMY)) + else + if(prob(20)) + owner.gain_trauma_type(BRAIN_TRAUMA_SEVERE, rand(TRAUMA_RESILIENCE_BASIC, TRAUMA_RESILIENCE_LOBOTOMY)) + else + owner.gain_trauma_type(BRAIN_TRAUMA_MILD, rand(TRAUMA_RESILIENCE_BASIC, TRAUMA_RESILIENCE_LOBOTOMY)) \ No newline at end of file diff --git a/code/modules/antagonists/abductor/equipment/glands/ventcrawl.dm b/code/modules/antagonists/abductor/equipment/glands/ventcrawl.dm new file mode 100644 index 0000000000..d1ea135497 --- /dev/null +++ b/code/modules/antagonists/abductor/equipment/glands/ventcrawl.dm @@ -0,0 +1,12 @@ +/obj/item/organ/heart/gland/ventcrawling + true_name = "pliant cartilage enabler" + cooldown_low = 1800 + cooldown_high = 2400 + uses = 1 + icon_state = "vent" + mind_control_uses = 4 + mind_control_duration = 1800 + +/obj/item/organ/heart/gland/ventcrawling/activate() + to_chat(owner, "You feel very stretchy.") + owner.ventcrawler = VENTCRAWLER_ALWAYS \ No newline at end of file diff --git a/code/modules/antagonists/abductor/equipment/glands/viral.dm b/code/modules/antagonists/abductor/equipment/glands/viral.dm new file mode 100644 index 0000000000..4d4f865a7c --- /dev/null +++ b/code/modules/antagonists/abductor/equipment/glands/viral.dm @@ -0,0 +1,34 @@ +/obj/item/organ/heart/gland/viral + true_name = "contamination incubator" + cooldown_low = 1800 + cooldown_high = 2400 + uses = 1 + icon_state = "viral" + mind_control_uses = 1 + mind_control_duration = 1800 + +/obj/item/organ/heart/gland/viral/activate() + to_chat(owner, "You feel sick.") + var/datum/disease/advance/A = random_virus(pick(2,6),6) + A.carrier = TRUE + owner.ForceContractDisease(A, FALSE, TRUE) + +/obj/item/organ/heart/gland/viral/proc/random_virus(max_symptoms, max_level) + if(max_symptoms > VIRUS_SYMPTOM_LIMIT) + max_symptoms = VIRUS_SYMPTOM_LIMIT + var/datum/disease/advance/A = new /datum/disease/advance() + var/list/datum/symptom/possible_symptoms = list() + for(var/symptom in subtypesof(/datum/symptom)) + var/datum/symptom/S = symptom + if(initial(S.level) > max_level) + continue + if(initial(S.level) <= 0) //unobtainable symptoms + continue + possible_symptoms += S + for(var/i in 1 to max_symptoms) + var/datum/symptom/chosen_symptom = pick_n_take(possible_symptoms) + if(chosen_symptom) + var/datum/symptom/S = new chosen_symptom + A.symptoms += S + A.Refresh() //just in case someone already made and named the same disease + return A \ No newline at end of file diff --git a/code/modules/antagonists/abductor/machinery/console.dm b/code/modules/antagonists/abductor/machinery/console.dm index bcf02bda01..47294bc766 100644 --- a/code/modules/antagonists/abductor/machinery/console.dm +++ b/code/modules/antagonists/abductor/machinery/console.dm @@ -43,12 +43,15 @@ dat += "Collected Samples : [points]
" dat += "Gear Credits: [credits]
" dat += "Transfer data in exchange for supplies:
" - dat += "Advanced Baton
" - dat += "Agent Helmet
" - dat += "Agent Vest
" - dat += "Radio Silencer
" - dat += "Science Tool
" - dat += "Mental Interface Device
" + dat += "Advanced Baton (2 Credits)
" + dat += "Mental Interface Device (2 Credits)
" + dat += "Reagent Synthesizer (2 Credits)
" + dat += "Shrink Ray Blaster (2 Credits)
" + dat += "Agent Helmet (1 Credit)
" + dat += "Agent Vest (1 Credit)
" + dat += "Radio Silencer (1 Credit)
" + dat += "Science Tool (1 Credit)
" + dat += "Superlingual Matrix (1 Credit)
" else dat += "NO EXPERIMENT MACHINE DETECTED
" @@ -101,7 +104,7 @@ else if(href_list["dispense"]) switch(href_list["dispense"]) if("baton") - Dispense(/obj/item/abductor_baton,cost=2) + Dispense(/obj/item/abductor/baton,cost=2) if("helmet") Dispense(/obj/item/clothing/head/helmet/abductor) if("silencer") @@ -112,6 +115,12 @@ Dispense(/obj/item/clothing/suit/armor/abductor/vest) if("mind_device") Dispense(/obj/item/abductor/mind_device,cost=2) + if("chem_dispenser") + Dispense(/obj/item/abductor_machine_beacon/chem_dispenser,cost=2) + if("tongue") + Dispense(/obj/item/organ/tongue/abductor) + if("shrink_ray") + Dispense(/obj/item/gun/energy/shrink_ray,cost=2) updateUsrDialog() /obj/machinery/abductor/console/proc/TeleporterRetrieve() @@ -136,9 +145,9 @@ var/entry_name if(remote) - entry_name = show_radial_menu(usr, camera.eyeobj, disguises2) + entry_name = show_radial_menu(usr, camera.eyeobj, disguises2, tooltips = TRUE) else - entry_name = show_radial_menu(usr, src, disguises2) + entry_name = show_radial_menu(usr, src, disguises2, require_near = TRUE, tooltips = TRUE) var/datum/icon_snapshot/chosen = disguises[entry_name] if(chosen && vest && (remote || in_range(usr,src))) @@ -236,4 +245,4 @@ new item(drop_location) else - say("Insufficent data!") + say("Insufficent data!") \ No newline at end of file diff --git a/code/modules/antagonists/bloodsucker/bloodsucker_flaws.dm b/code/modules/antagonists/bloodsucker/bloodsucker_flaws.dm new file mode 100644 index 0000000000..77169efd61 --- /dev/null +++ b/code/modules/antagonists/bloodsucker/bloodsucker_flaws.dm @@ -0,0 +1,84 @@ + +// Getting Flaws: +// +// Killing crew +// +// Gaining ranks + + + +// * COMPULSION * Things you must do +// +// SELECTIVE: -Gender/BloodType/Job sustains you, but others give you less. +// + + + + +// * WEAKNESSES * Things that may harm you +// +// LIGHTS: -Bright light nullifies the Examine benefits of Masquerade. +// -Bright lights disable your healing (including in Torpor) +// +// STAKES: -Stakes kill you immediately. +// +// PAINFUL: -Your feed victims scream, despite being unconscious. +// +// FIRE: -You only need your max health (not x2) in fire damage to die. +// +// CORPSE: -Your Masquerade turns off when unconscious or crit. +// +// FERAL: - +// +// CRAVEN + + + + + + + + + + + + + + // BANES // + +// These are basically small weaknesses that affect your character in certain circumstances. +// As a rule, they should be specific as to when they happen, or have only some certain +// drawback. + +// (core ideas) +// SENSITIVE: You are slightly blinded by bright lights. +// DARKFRIEND: Your automatic healing is at a crawl when in bright light. +// TRADITIONAL: Every five minutes spent outside a coffin lowers your rate of automatic healing. +// CONSUMED: Every five minutes spent outside a coffin increases the rate at which your blood ticks down. +// GOURMAND: Animals and blood bags offer you no nourishment when feeding. +// DEATHMASK: You no longer fake having a heartbeat, and always show up as pale when examined. +// BESTIAL: When your blood is low, you will twitch involuntarily. + +// (alternate ideas) +// STERILE: There is a high chance that turning corpses to Bloodsuckers will fail, and further attempts on them by you are impossible. +// FERAL: You're a threat to Vampire-kind: New Bloodsuckers may have an Objective to destroy you. +// UNHOLY: The Chapel, the Bible, and Holy Water set you on fire. +// PARANOID: Only your own claimed coffin counts for healing and banes. + + +// ON LEVEL-UP: +// Burn Damage increases +// Regen Rate increases +// Max Punch Damage increase +// Reset Level Timer +// Select Bane + + +// How to Burn Vamps: +// C.adjustFireLoss(20) +// C.adjust_fire_stacks(6) +// C.IgniteMob() + + +/datum/antagonist/bloodsucker/proc/AssignRandomBane() + return \ No newline at end of file diff --git a/code/modules/antagonists/bloodsucker/bloodsucker_integration.dm b/code/modules/antagonists/bloodsucker/bloodsucker_integration.dm new file mode 100644 index 0000000000..3a6b4efedb --- /dev/null +++ b/code/modules/antagonists/bloodsucker/bloodsucker_integration.dm @@ -0,0 +1,148 @@ +// INTEGRATION: Adding Procs and Datums to existing "classes" +/mob/living/proc/AmBloodsucker(falseIfInDisguise=FALSE) + // No Datum + if(!mind || !mind.has_antag_datum(ANTAG_DATUM_BLOODSUCKER)) + return FALSE + return TRUE + + +/mob/living/proc/HaveBloodsuckerBodyparts(var/displaymessage="") // displaymessage can be something such as "rising from death" for Torpid Sleep. givewarningto is the person receiving messages. + if(!getorganslot(ORGAN_SLOT_HEART)) + if(displaymessage != "") + to_chat(src, "Without a heart, you are incapable of [displaymessage].") + return FALSE + if(!get_bodypart(BODY_ZONE_HEAD)) + if(displaymessage != "") + to_chat(src, "Without a head, you are incapable of [displaymessage].") + return FALSE + if(!getorgan(/obj/item/organ/brain)) // NOTE: This is mostly just here so we can do one scan for all needed parts when creating a vamp. You probably won't be trying to use powers w/out a brain. + if(displaymessage != "") + to_chat(src, "Without a brain, you are incapable of [displaymessage].") + return FALSE + return TRUE + + + +// GET DAMAGE + + +// Do NOT count the damage on prosthetics for this. +/mob/living/proc/getBruteLoss_nonProsthetic() + return getBruteLoss() + +/mob/living/proc/getFireLoss_nonProsthetic() + return getFireLoss() + +/mob/living/carbon/getBruteLoss_nonProsthetic() + var/amount = 0 + for(var/obj/item/bodypart/BP in bodyparts) + if(BP.status < 2) + amount += BP.brute_dam + return amount + +/mob/living/carbon/getFireLoss_nonProsthetic() + var/amount = 0 + for(var/obj/item/bodypart/BP in bodyparts) + if(BP.status < 2) + amount += BP.burn_dam + return amount + +/mob/living/carbon +// EXAMINING +/mob/living/carbon/human/proc/ReturnVampExamine(var/mob/viewer) + if(!mind || !viewer.mind) + return "" + // Target must be a Vamp + var/datum/antagonist/bloodsucker/bloodsuckerdatum = mind.has_antag_datum(ANTAG_DATUM_BLOODSUCKER) + if(!bloodsuckerdatum) + return "" + // Viewer is Target's Vassal? + if(viewer.mind.has_antag_datum(ANTAG_DATUM_VASSAL) in bloodsuckerdatum.vassals) + var/returnString = "\[This is your Master!\]" + var/returnIcon = "[icon2html('icons/misc/language.dmi', world, "bloodsucker")]" + returnString += "\n" + return returnIcon + returnString + // Viewer not a Vamp AND not the target's vassal? + if(!viewer.mind.has_antag_datum(ANTAG_DATUM_BLOODSUCKER) && !(viewer in bloodsuckerdatum.vassals)) + return "" + // Default String + var/returnString = "\[[bloodsuckerdatum.ReturnFullName(1)]\]" + var/returnIcon = "[icon2html('icons/misc/language.dmi', world, "bloodsucker")]" + + // In Disguise (Veil)? + //if (name_override != null) + // returnString += " ([real_name] in disguise!) " + + //returnString += "\n" Don't need spacers. Using . += "" in examine.dm does this on its own. + return returnIcon + returnString + + +/mob/living/carbon/human/proc/ReturnVassalExamine(var/mob/viewer) + if(!mind || !viewer.mind) + return "" + // Am I not even a Vassal? Then I am not marked. + var/datum/antagonist/vassal/vassaldatum = mind.has_antag_datum(ANTAG_DATUM_VASSAL) + if(!vassaldatum) + return "" + // Only Vassals and Bloodsuckers can recognize marks. + if(!viewer.mind.has_antag_datum(ANTAG_DATUM_BLOODSUCKER) && !viewer.mind.has_antag_datum(ANTAG_DATUM_VASSAL)) + return "" + + // Default String + var/returnString = "\[" + var/returnIcon = "" + // Am I Viewer's Vassal? + if(vassaldatum.master.owner == viewer.mind) + returnString += "This [dna.species.name] bears YOUR mark!" + returnIcon = "[icon2html('icons/misc/mark_icons.dmi', world, "vassal")]" + // Am I someone ELSE'S Vassal? + else if(viewer.mind.has_antag_datum(ANTAG_DATUM_BLOODSUCKER)) + returnString += "This [dna.species.name] bears the mark of [vassaldatum.master.ReturnFullName(vassaldatum.master.owner.current,1)]" + returnIcon = "[icon2html('icons/misc/mark_icons.dmi', world, "vassal_grey")]" + // Are you serving the same master as I am? + else if(viewer.mind.has_antag_datum(ANTAG_DATUM_VASSAL) in vassaldatum.master.vassals) + returnString += "[p_they(TRUE)] bears the mark of your Master" + returnIcon = "[icon2html('icons/misc/mark_icons.dmi', world, "vassal")]" + // You serve a different Master than I do. + else + returnString += "[p_they(TRUE)] bears the mark of another Bloodsucker" + returnIcon = "[icon2html('icons/misc/mark_icons.dmi', world, "vassal_grey")]" + + returnString += "\]" // \n" Don't need spacers. Using . += "" in examine.dm does this on its own. + return returnIcon + returnString + + +// Am I "pale" when examined? Bloodsuckers can trick this. +/mob/living/carbon/proc/ShowAsPaleExamine() + + // Normal Creatures: + if(!mind || !mind.has_antag_datum(ANTAG_DATUM_BLOODSUCKER)) + return blood_volume < (BLOOD_VOLUME_SAFE * blood_ratio) + + var/datum/antagonist/bloodsucker/bloodsuckerdatum = mind.has_antag_datum(ANTAG_DATUM_BLOODSUCKER) + if(bloodsuckerdatum.poweron_masquerade) + return FALSE + + // If a Bloodsucker is malnourished, AND if his temperature matches his surroundings (aka he hasn't fed recently and looks COLD)... + return blood_volume < (BLOOD_VOLUME_OKAY * blood_ratio) // && !(bodytemperature <= get_temperature() + 2) + +/mob/living/carbon/human/ShowAsPaleExamine() + // Check for albino, as per human/examine.dm's check. + if(dna.species.use_skintones && skin_tone == "albino") + return TRUE + + return ..() // Return vamp check + +/mob/living/carbon/proc/scan_blood_volume() + // Vamps don't show up normally to scanners unless Masquerade power is on ----> scanner.dm + if(mind) + var/datum/antagonist/bloodsucker/bloodsuckerdatum = mind.has_antag_datum(ANTAG_DATUM_BLOODSUCKER) + if (istype(bloodsuckerdatum) && bloodsuckerdatum.poweron_masquerade) + return BLOOD_VOLUME_NORMAL + return blood_volume + +/mob/living/proc/IsFrenzied() + return FALSE + +/mob/living/proc/StartFrenzy(inTime = 120) + set waitfor = FALSE diff --git a/code/modules/antagonists/bloodsucker/bloodsucker_life.dm b/code/modules/antagonists/bloodsucker/bloodsucker_life.dm new file mode 100644 index 0000000000..9174692b49 --- /dev/null +++ b/code/modules/antagonists/bloodsucker/bloodsucker_life.dm @@ -0,0 +1,361 @@ + + +// TO PLUG INTO LIFE: + +// Cancel BLOOD life +// Cancel METABOLISM life (or find a way to control what gets digested) +// Create COLDBLOODED trait (thermal homeostasis) + +// EXAMINE +// +// Show as dead when... + +/datum/antagonist/bloodsucker/proc/LifeTick()// Should probably run from life.dm, same as handle_changeling, but will be an utter pain to move + set waitfor = FALSE // Don't make on_gain() wait for this function to finish. This lets this code run on the side. + var/notice_healing = FALSE + while(owner && !AmFinalDeath()) // owner.has_antag_datum(ANTAG_DATUM_BLOODSUCKER) == src + if(owner.current.stat == CONSCIOUS && !poweron_feed && !HAS_TRAIT(owner.current, TRAIT_DEATHCOMA)) // Deduct Blood + AddBloodVolume(-0.1) // -.15 (before tick went from 10 to 30, but we also charge more for faking life now) + if(HandleHealing(1)) // Heal + if(notice_healing == FALSE && owner.current.blood_volume > 0) + to_chat(owner, "The power of your blood begins knitting your wounds...") + notice_healing = TRUE + else if(notice_healing == TRUE) + notice_healing = FALSE // Apply Low Blood Effects + HandleStarving() // Death + HandleDeath() // Standard Update + update_hud()// Daytime Sleep in Coffin + if (SSticker.mode.is_daylight() && !HAS_TRAIT_FROM(owner.current, TRAIT_DEATHCOMA, "bloodsucker")) + if(istype(owner.current.loc, /obj/structure/closet/crate/coffin)) + Torpor_Begin() + // Wait before next pass + sleep(10) + FreeAllVassals() // Free my Vassals! (if I haven't yet) + +///////////////////////////////////////////////////////////////////////////////////////////////////////////////////// + +// BLOOD + +///////////////////////////////////////////////////////////////////////////////////////////////////////////////////// + +/datum/antagonist/bloodsucker/proc/AddBloodVolume(value) + owner.current.blood_volume = CLAMP(owner.current.blood_volume + value, 0, maxBloodVolume) + update_hud() + +/datum/antagonist/bloodsucker/proc/HandleFeeding(mob/living/carbon/target, mult=1) + // mult: SILENT feed is 1/3 the amount + var/blood_taken = min(feedAmount, target.blood_volume) * mult // Starts at 15 (now 8 since we doubled the Feed time) + target.blood_volume -= blood_taken + // Simple Animals lose a LOT of blood, and take damage. This is to keep cats, cows, and so forth from giving you insane amounts of blood. + if(!ishuman(target)) + target.blood_volume -= (blood_taken / max(target.mob_size, 0.1)) * 3.5 // max() to prevent divide-by-zero + target.apply_damage_type(blood_taken / 3.5) // Don't do too much damage, or else they die and provide no blood nourishment. + if(target.blood_volume <= 0) + target.blood_volume = 0 + target.death(0) + /////////// + // Shift Body Temp (toward Target's temp, by volume taken) + owner.current.bodytemperature = ((owner.current.blood_volume * owner.current.bodytemperature) + (blood_taken * target.bodytemperature)) / (owner.current.blood_volume + blood_taken) + // our volume * temp, + their volume * temp, / total volume + /////////// + // Reduce Value Quantity + if(target.stat == DEAD) // Penalty for Dead Blood + blood_taken /= 3 + if(!ishuman(target)) // Penalty for Non-Human Blood + blood_taken /= 2 + //if (!iscarbon(target)) // Penalty for Animals (they're junk food) + // Apply to Volume + AddBloodVolume(blood_taken) + // Reagents (NOT Blood!) + if(target.reagents && target.reagents.total_volume) + target.reagents.reaction(owner.current, INGEST, 1) // Run Reaction: what happens when what they have mixes with what I have? + target.reagents.trans_to(owner.current, 1) // Run transfer of 1 unit of reagent from them to me. + // Blood Gulp Sound + owner.current.playsound_local(null, 'sound/effects/singlebeat.ogg', 40, 1) // Play THIS sound for user only. The "null" is where turf would go if a location was needed. Null puts it right in their head. + +///////////////////////////////////////////////////////////////////////////////////////////////////////////////////// + +// HEALING + +///////////////////////////////////////////////////////////////////////////////////////////////////////////////////// + +/datum/antagonist/bloodsucker/proc/HandleHealing(mult = 1) + // NOTE: Mult of 0 is just a TEST to see if we are injured and need to go into Torpor! + //It is called from your coffin on close (by you only) + if(poweron_masquerade == TRUE || owner.current.AmStaked()) + return FALSE + owner.current.adjustStaminaLoss(-2 + (regenRate * -10) * mult, 0) // Humans lose stamina damage really quickly. Vamps should heal more. + owner.current.adjustCloneLoss(-1 * (regenRate * 4) * mult, 0) + owner.current.adjustOrganLoss(ORGAN_SLOT_BRAIN, -1 * (regenRate * 4) * mult) //adjustBrainLoss(-1 * (regenRate * 4) * mult, 0) + // No Bleeding + if(ishuman(owner.current)) //NOTE Current bleeding is horrible, not to count the amount of blood ballistics delete. + var/mob/living/carbon/human/H = owner.current + H.bleed_rate = 0 + if(iscarbon(owner.current)) // Damage Heal: Do I have damage to ANY bodypart? + var/mob/living/carbon/C = owner.current + var/costMult = 1 // Coffin makes it cheaper + var/fireheal = 0 // BURN: Heal in Coffin while Fakedeath, or when damage above maxhealth (you can never fully heal fire) + var/amInCoffinWhileTorpor = istype(C.loc, /obj/structure/closet/crate/coffin) && (mult == 0 || HAS_TRAIT(C, TRAIT_DEATHCOMA)) // Check for mult 0 OR death coma. (mult 0 means we're testing from coffin) + if(amInCoffinWhileTorpor) + mult *= 5 // Increase multiplier if we're sleeping in a coffin. + fireheal = min(C.getFireLoss_nonProsthetic(), regenRate) // NOTE: Burn damage ONLY heals in torpor. + costMult = 0.25 + C.ExtinguishMob() + CureDisabilities() // Extinguish Fire + C.remove_all_embedded_objects() // Remove Embedded! + owner.current.regenerate_organs() // Heal Organs (will respawn original eyes etc. but we replace right away, next) + CheckVampOrgans() // Heart, Eyes + else + if(owner.current.blood_volume <= 0) // No Blood? Lower Mult + mult = 0.25 + // Crit from burn? Lower damage to maximum allowed. + //if (C.getFireLoss() > owner.current.getMaxHealth()) + // fireheal = regenRate / 2 + // BRUTE: Always Heal + var/bruteheal = min(C.getBruteLoss_nonProsthetic(), regenRate) + var/toxinheal = min(C.getToxLoss(), regenRate) + // Heal if Damaged + if(bruteheal + fireheal + toxinheal > 0) // Just a check? Don't heal/spend, and return. + if(mult == 0) + return TRUE + // We have damage. Let's heal (one time) + C.adjustBruteLoss(-bruteheal * mult, forced = TRUE)// Heal BRUTE / BURN in random portions throughout the body. + C.adjustFireLoss(-fireheal * mult, forced = TRUE) + C.adjustToxLoss(-toxinheal * mult * 2, forced = TRUE) //Toxin healing because vamps arent immune + //C.heal_overall_damage(bruteheal * mult, fireheal * mult) // REMOVED: We need to FORCE this, because otherwise, vamps won't heal EVER. Swapped to above. + AddBloodVolume((bruteheal * -0.5 + fireheal * -1) / mult * costMult) // Costs blood to heal + return TRUE // Healed! Done for this tick. + if(amInCoffinWhileTorpor) // Limbs? (And I have no other healing) + var/list/missing = owner.current.get_missing_limbs() // Heal Missing + if (missing.len) // Cycle through ALL limbs and regen them! + for (var/targetLimbZone in missing) // 1) Find ONE Limb and regenerate it. + owner.current.regenerate_limb(targetLimbZone, 0) // regenerate_limbs() <--- If you want to EXCLUDE certain parts, do it like this ----> regenerate_limbs(0, list("head")) + var/obj/item/bodypart/L = owner.current.get_bodypart( targetLimbZone ) // 2) Limb returns Damaged + AddBloodVolume(50 * costMult) // Costs blood to heal + L.brute_dam = 60 + to_chat(owner.current, "Your flesh knits as it regrows [L]!") + playsound(owner.current, 'sound/magic/demon_consume.ogg', 50, 1) + // DONE! After regenerating ANY number of limbs, we stop here. + return TRUE + /*else // REMOVED: For now, let's just leave prosthetics on. Maybe you WANT to be a robovamp. + // Remove Prosthetic/False Limb + for(var/obj/item/bodypart/BP in C.bodyparts) + message_admins("T1: [BP] ") + if (istype(BP) && BP.status == 2) + message_admins("T2: [BP] ") + BP.drop_limb() + return TRUE */ + // NOTE: Limbs have a "status", like their hosts "stat". 2 is dead (aka Prosthetic). 1 seems to be idle/alive.*/ + return FALSE + +/datum/antagonist/bloodsucker/proc/CureDisabilities() + var/mob/living/carbon/C = owner.current + C.cure_blind(list(EYE_DAMAGE))//() + C.cure_nearsighted(EYE_DAMAGE) + C.set_blindness(0) // Added 9/2/19 + C.set_blurriness(0) // Added 9/2/19 + C.update_tint() // Added 9/2/19 + C.update_sight() // Added 9/2/19 + for(var/O in C.internal_organs) //owner.current.adjust_eye_damage(-100) // This was removed by TG + var/obj/item/organ/organ = O + organ.setOrganDamage(0) + owner.current.cure_husk() + +// I am thirsty for blud! +/datum/antagonist/bloodsucker/proc/HandleStarving() + + // High: Faster Healing + // Med: Pale + // Low: Twitch + // V.Low: Blur Vision + // EMPTY: Frenzy! + // BLOOD_VOLUME_GOOD: [336] Pale (handled in bloodsucker_integration.dm + // BLOOD_VOLUME_BAD: [224] Jitter + if(owner.current.blood_volume < BLOOD_VOLUME_BAD && !prob(0.5)) + owner.current.Jitter(3) + // BLOOD_VOLUME_SURVIVE: [122] Blur Vision + if(owner.current.blood_volume < BLOOD_VOLUME_BAD / 2) + owner.current.blur_eyes(8 - 8 * (owner.current.blood_volume / BLOOD_VOLUME_BAD)) + // Nutrition + owner.current.nutrition = min(owner.current.blood_volume, NUTRITION_LEVEL_FED) // <-- 350 //NUTRITION_LEVEL_FULL +///////////////////////////////////////////////////////////////////////////////////////////////////////////////////// + +// DEATH + +///////////////////////////////////////////////////////////////////////////////////////////////////////////////////// + +/datum/antagonist/bloodsucker/proc/HandleDeath() + // FINAL DEATH + // Fire Damage? (above double health) + if (owner.current.getFireLoss_nonProsthetic() >= owner.current.getMaxHealth() * 2) + FinalDeath() + return + // Staked while "Temp Death" or Asleep + if (owner.current.StakeCanKillMe() && owner.current.AmStaked()) + FinalDeath() + return + // Not "Alive"? + if (!owner.current || !isliving(owner.current) || isbrain(owner.current) || !get_turf(owner.current)) + FinalDeath() + return + // Missing Brain or Heart? + if (!owner.current.HaveBloodsuckerBodyparts()) + FinalDeath() + return + // Disable Powers: Masquerade * NOTE * This should happen as a FLAW! + //if (stat >= UNCONSCIOUS) + // for (var/datum/action/bloodsucker/masquerade/P in powers) + // P.Deactivate() + // TEMP DEATH + var/total_brute = owner.current.getBruteLoss_nonProsthetic() + var/total_burn = owner.current.getFireLoss_nonProsthetic() + var/total_toxloss = owner.current.getToxLoss() //This is neater than just putting it in total_damage + var/total_damage = total_brute + total_burn + total_toxloss + // Died? Convert to Torpor (fake death) + if (owner.current.stat >= DEAD) + Torpor_Begin() + to_chat(owner, "Your immortal body will not yet relinquish your soul to the abyss. You enter Torpor.") + if (poweron_masquerade == TRUE) + to_chat(owner, "Your wounds will not heal until you disable the Masquerade power.") + // End Torpor: + else // No damage, OR toxin healed AND brute healed and NOT in coffin (since you cannot heal burn) + if (total_damage <= 0 || total_toxloss <= 0 && total_brute <= 0 && !istype(owner.current.loc, /obj/structure/closet/crate/coffin)) + // Not Daytime, Not in Torpor + if (!SSticker.mode.is_daylight() && HAS_TRAIT_FROM(owner.current, TRAIT_DEATHCOMA, "bloodsucker")) + Torpor_End() + // Fake Unconscious + if (poweron_masquerade == TRUE && total_damage >= owner.current.getMaxHealth() - HEALTH_THRESHOLD_FULLCRIT) + owner.current.Unconscious(20,1) + + //HEALTH_THRESHOLD_CRIT 0 + //HEALTH_THRESHOLD_FULLCRIT -30 + //HEALTH_THRESHOLD_DEAD -100 + +/datum/antagonist/bloodsucker/proc/Torpor_Begin(amInCoffin=FALSE) + owner.current.stat = UNCONSCIOUS + owner.current.fakedeath("bloodsucker") // Come after UNCONSCIOUS or else it fails + ADD_TRAIT(owner.current, TRAIT_NODEATH, "bloodsucker") // Without this, you'll just keep dying while you recover. + ADD_TRAIT(owner.current, TRAIT_RESISTHIGHPRESSURE, "bloodsucker") // So you can heal in 0 G. otherwise you just...heal forever. + ADD_TRAIT(owner.current, TRAIT_RESISTLOWPRESSURE, "bloodsucker") // So you can heal in 0 G. otherwise you just...heal forever. + // Visuals + owner.current.update_sight() + owner.current.reload_fullscreen() + // Disable ALL Powers + for (var/datum/action/bloodsucker/power in powers) + if (power.active && !power.can_use_in_torpor) + power.DeactivatePower() + + +/datum/antagonist/bloodsucker/proc/Torpor_End() + owner.current.stat = SOFT_CRIT + owner.current.cure_fakedeath("bloodsucker") // Come after SOFT_CRIT or else it fails + REMOVE_TRAIT(owner.current, TRAIT_NODEATH, "bloodsucker") + REMOVE_TRAIT(owner.current, TRAIT_RESISTHIGHPRESSURE, "bloodsucker") + REMOVE_TRAIT(owner.current, TRAIT_RESISTLOWPRESSURE, "bloodsucker") + to_chat(owner, "You have recovered from Torpor.") + + +/datum/antagonist/proc/AmFinalDeath() + // Standard Antags can be dead OR final death + return owner && (owner.current && owner.current.stat >= DEAD || owner.AmFinalDeath()) + +/datum/antagonist/bloodsucker/AmFinalDeath() + return owner && owner.AmFinalDeath() +/datum/antagonist/changeling/AmFinalDeath() + return owner && owner.AmFinalDeath() + +/datum/mind/proc/AmFinalDeath() + return !current || QDELETED(current) || !isliving(current) || isbrain(current) || !get_turf(current) // NOTE: "isliving()" is not the same as STAT == CONSCIOUS. This is to make sure you're not a BORG (aka silicon) + +/datum/antagonist/bloodsucker/proc/FinalDeath() + if(!iscarbon(owner.current)) //Check for non carbons. + owner.current.gib() + return + playsound(get_turf(owner.current), 'sound/effects/tendril_destroyed.ogg', 60, 1) + owner.current.drop_all_held_items() + owner.current.unequip_everything() + var/mob/living/carbon/C = owner.current + C.remove_all_embedded_objects() + // Make me UN-CLONEABLE + owner.current.hellbound = TRUE // This was done during creation, but let's do it again one more time...to make SURE this guy stays dead, but they dont stay dead because brains can be cloned! + // Free my Vassals! + FreeAllVassals() + // Elders get Dusted + if (vamplevel >= 4) // (vamptitle) + owner.current.visible_message("[owner.current]'s skin crackles and dries, their skin and bones withering to dust. A hollow cry whips from what is now a sandy pile of remains.", \ + "Your soul escapes your withering body as the abyss welcomes you to your Final Death.", \ + "You hear a dry, crackling sound.") + owner.current.dust() + // Fledglings get Gibbed + else + owner.current.visible_message("[owner.current]'s skin bursts forth in a spray of gore and detritus. A horrible cry echoes from what is now a wet pile of decaying meat.", \ + "Your soul escapes your withering body as the abyss welcomes you to your Final Death.", \ + "You hear a wet, bursting sound.") + owner.current.gib(TRUE, FALSE, FALSE)//Brain cloning is wierd and allows hellbounds. Lets destroy the brain for safety. + playsound(owner.current.loc, 'sound/effects/tendril_destroyed.ogg', 40, 1) + + + +///////////////////////////////////////////////////////////////////////////////////////////////////////////////////// + +// HUMAN FOOD + +///////////////////////////////////////////////////////////////////////////////////////////////////////////////////// + +/mob/proc/CheckBloodsuckerEatFood(var/food_nutrition) + if (!isliving(src)) + return + var/mob/living/L = src + if (!L.AmBloodsucker()) + return + // We're a vamp? Try to eat food... + var/datum/antagonist/bloodsucker/bloodsuckerdatum = mind.has_antag_datum(ANTAG_DATUM_BLOODSUCKER) + bloodsuckerdatum.handle_eat_human_food(food_nutrition) + + +/datum/antagonist/bloodsucker/proc/handle_eat_human_food(var/food_nutrition) // Called from snacks.dm and drinks.dm + set waitfor = FALSE + if (!owner.current || !iscarbon(owner.current)) + return + var/mob/living/carbon/C = owner.current + // Remove Nutrition, Give Bad Food + C.nutrition -= food_nutrition + foodInGut += food_nutrition + // Already ate some bad clams? Then we can back out, because we're already sick from it. + if (foodInGut != food_nutrition) + return + // Haven't eaten, but I'm in a Human Disguise. + else if (poweron_masquerade) + to_chat(C, "Your stomach turns, but your \"human disguise\" keeps the food down...for now.") + // Keep looping until we purge. If we have activated our Human Disguise, we ignore the food. But it'll come up eventually... + var/sickphase = 0 + while (foodInGut) + sleep(50) + C.adjust_disgust(10 * sickphase) + // Wait an interval... + sleep(50 + 50 * sickphase) // At intervals of 100, 150, and 200. (10 seconds, 15 seconds, and 20 seconds) + // Died? Cancel + if(C.stat == DEAD) + return + // Put up disguise? Then hold off the vomit. + if(poweron_masquerade) + if(sickphase > 0) + to_chat(C, "Your stomach settles temporarily. You regain your composure...for now.") + sickphase = 0 + continue + switch(sickphase) + if (1) + to_chat(C, "You feel unwell. You can taste ash on your tongue.") + C.Stun(10) + if (2) + to_chat(C, "Your stomach turns. Whatever you ate tastes of grave dirt and brimstone.") + C.Dizzy(15) + C.Stun(13) + if (3) + to_chat(C, "You purge the food of the living from your viscera! You've never felt worse.") + C.vomit(foodInGut * 4, foodInGut * 2, 0) // (var/lost_nutrition = 10, var/blood = 0, var/stun = 1, var/distance = 0, var/message = 1, var/toxic = 0) + C.blood_volume = max(0, C.blood_volume - foodInGut * 2) + C.Stun(30) + //C.Dizzy(50) + foodInGut = 0 + sickphase ++ diff --git a/code/modules/antagonists/bloodsucker/bloodsucker_objectives.dm b/code/modules/antagonists/bloodsucker/bloodsucker_objectives.dm new file mode 100644 index 0000000000..63e1470576 --- /dev/null +++ b/code/modules/antagonists/bloodsucker/bloodsucker_objectives.dm @@ -0,0 +1,351 @@ + + +// Hide a random object somewhere on the station: +// var/turf/targetturf = get_random_station_turf() +// var/turf/targetturf = get_safe_random_station_turf() + + + + +/datum/objective/bloodsucker + martyr_compatible = TRUE + +// GENERATE! +/datum/objective/bloodsucker/proc/generate_objective() + update_explanation_text() + +///////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////// + +// // PROCS // // + + +/datum/objective/bloodsucker/proc/return_possible_targets() + var/list/possible_targets = list() + + // Look at all crew members, and for/loop through. + for(var/datum/mind/possible_target in get_crewmember_minds()) + // Check One: Default Valid User + if(possible_target != owner && ishuman(possible_target.current) && possible_target.current.stat != DEAD)// && is_unique_objective(possible_target)) + // Check Two: Am Bloodsucker? OR in Bloodsucker list? + if (possible_target.has_antag_datum(ANTAG_DATUM_BLOODSUCKER) || (possible_target in SSticker.mode.bloodsuckers)) + continue + else + possible_targets += possible_target + + return possible_targets + + + +///////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////// +///////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////// + +/datum/objective/bloodsucker/lair + +// EXPLANATION +/datum/objective/bloodsucker/lair/update_explanation_text() + explanation_text = "Create a lair by claiming a coffin, and protect it until the end of the shift"// Make sure to keep it safe!" + +// WIN CONDITIONS? +/datum/objective/bloodsucker/lair/check_completion() + var/datum/antagonist/bloodsucker/antagdatum = owner.has_antag_datum(ANTAG_DATUM_BLOODSUCKER) + if (antagdatum && antagdatum.coffin && antagdatum.lair) + return TRUE + return FALSE + + // Space_Station_13_areas.dm <--- all the areas + +///////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////// +///////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////// + +// Vassal becomes a Head, or part of a department +/datum/objective/bloodsucker/protege + + // LOOKUP: /datum/crewmonitor/proc/update_data(z) for .assignment to see how to get a person's PDA. + var/list/roles = list( + "Captain", + "Head of Personnel", + "Research Director", + "Chief Engineer", + "Chief Medical Officer", + "Quartermaster" + ) + var/list/departs = list( + "Research Director", + "Chief Engineer", + "Chief Medical Officer", + "Quartermaster" + ) + + + var/target_role // Equals "HEAD" when it's not a department role. + var/department_string + +// GENERATE! +/datum/objective/bloodsucker/protege/generate_objective() + target_role = rand(0,2) == 0 ? "HEAD" : pick(departs) + + // Heads? + if (target_role == "HEAD") + target_amount = rand(1, round(SSticker.mode.num_players() / 20)) + target_amount = CLAMP(target_amount,1,3) + // Department? + else + switch(target_role) + if("Research Director") + department_string = "Science" + if("Chief Engineer") + department_string = "Engineering" + if("Chief Medical Officer") + department_string = "Medical" + if("Quartermaster") + department_string = "Cargo" + target_amount = rand(round(SSticker.mode.num_players() / 20), round(SSticker.mode.num_players() / 10)) + target_amount = CLAMP(target_amount, 2, 4) + ..() + +// EXPLANATION +/datum/objective/bloodsucker/protege/update_explanation_text() + if (target_role == "HEAD") + if (target_amount == 1) + explanation_text = "Guarantee a Vassal ends up as a Department Head or in a Leadership role." + else + explanation_text = "Guarantee [target_amount] Vassals end up as different Leadership or Department Heads." + else + explanation_text = "Have [target_amount] Vassal[target_amount==1?"":"s"] in the [department_string] department." + +// WIN CONDITIONS? +/datum/objective/bloodsucker/protege/check_completion() + + var/datum/antagonist/bloodsucker/antagdatum = owner.has_antag_datum(ANTAG_DATUM_BLOODSUCKER) + if (!antagdatum || antagdatum.vassals.len == 0) + return FALSE + + // Get list of all jobs that are qualified (for HEAD, this is already done) + var/list/valid_jobs + if (target_role == "HEAD") + valid_jobs = roles + else + valid_jobs = list() + var/list/alljobs = subtypesof(/datum/job) // This is just a list of TYPES, not the actual variables! + for(var/T in alljobs) + var/datum/job/J = SSjob.GetJobType(T) // + if (!istype(J)) + continue + // Found a job whose Dept Head matches either list of heads, or this job IS the head + if ((target_role in J.department_head) || target_role == J.title) + valid_jobs += J.title + + + // Check Vassals, and see if they match + var/objcount = 0 + var/list/counted_roles = list() // So you can't have more than one Captain count. + for(var/datum/antagonist/vassal/V in antagdatum.vassals) + if (!V || !V.owner) // Must exist somewhere, and as a vassal. + continue + + var/thisRole = "none" + + // Mind Assigned + if ((V.owner.assigned_role in valid_jobs) && !(V.owner.assigned_role in counted_roles)) + //to_chat(owner, "PROTEGE OBJECTIVE: (MIND ROLE)") + thisRole = V.owner.assigned_role + // Mob Assigned + else if ((V.owner.current.job in valid_jobs) && !(V.owner.current.job in counted_roles)) + //to_chat(owner, "PROTEGE OBJECTIVE: (MOB JOB)") + thisRole = V.owner.current.job + // PDA Assigned + else if (V.owner.current && ishuman(V.owner.current)) + var/mob/living/carbon/human/H = V.owner.current + var/obj/item/card/id/I = H.wear_id ? H.wear_id.GetID() : null + if (I && (I.assignment in valid_jobs) && !(I.assignment in counted_roles)) + //to_chat(owner, "PROTEGE OBJECTIVE: (GET ID)") + thisRole = I.assignment + + // NO MATCH + if (thisRole == "none") + continue + + // SUCCESS! + objcount ++ + if (target_role == "HEAD") + counted_roles += thisRole // Add to list so we don't count it again (but only if it's a Head) + + // NOTE!!!!!!!!!!! + + // Look for jobs value on mobs! This is assigned at start, but COULD be assigned from HoP? + // + // ALSO - Search through all jobs (look for prefs earlier that look for all jobs, and search through all jobs to see if their head matches the head listed, or it IS the head) + // + // ALSO - registered_account in _vending.dm for banks, and assigning new ones. + + //to_chat(antagdatum.owner, "PROTEGE OBJECTIVE: Final Count: [objcount] of [antagdatum.vassals.len] vassals") + return objcount >= target_amount + +///////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////// +///////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////// + +// Eat blood from a lot of people +/datum/objective/bloodsucker/gourmand + +// HOW: Track each feed (if human). Count victory. + + +///////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////// +///////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////// + +// Convert a crewmate +/datum/objective/bloodsucker/embrace + +// HOW: Find crewmate. Check if person is a bloodsucker + +///////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////// +///////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////// + +// Defile a facility with blood +/datum/objective/bloodsucker/desecrate + + // Space_Station_13_areas.dm <--- all the areas + +///////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////// +///////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////// + +// Destroy the Solar Arrays +/datum/objective/bloodsucker/solars + +// Space_Station_13_areas.dm <--- all the areas +/datum/objective/bloodsucker/solars/update_explanation_text() + explanation_text = "Prevent all solar arrays on the station from functioning." + +/datum/objective/bloodsucker/solars/check_completion() + // Sort through all /obj/machinery/power/solar_control in the station ONLY, and check that they are functioning. + // Make sure that lastgen is 0 or connected_panels.len is 0. Doesnt matter if it's tracking. + for (var/obj/machinery/power/solar_control/SC in SSsun.solars) + // Check On Station: + var/turf/T = get_turf(SC) + if(!T || !is_station_level(T.z)) // <------ Taken from NukeOp + //message_admins("DEBUG A: [SC] not on station!") + continue // Not on station! We don't care about this. + if (SC && SC.lastgen > 0 && SC.connected_panels.len > 0 && SC.connected_tracker) + return FALSE + return TRUE + +///////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////// +///////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////// + +// Steal hearts. You just really wanna have some hearts. +/datum/objective/bloodsucker/heartthief + // NOTE: Look up /steal in objective.dm for inspiration. + +// GENERATE! +/datum/objective/bloodsucker/heartthief/generate_objective() + target_amount = rand(2,3) + + update_explanation_text() + //dangerrating += target_amount * 2 + +// EXPLANATION +/datum/objective/bloodsucker/heartthief/update_explanation_text() + explanation_text = "Steal and keep [target_amount] heart[target_amount == 1 ? "" : "s"]." // TO DO: Limit them to Human Only! + +// WIN CONDITIONS? +/datum/objective/bloodsucker/heartthief/check_completion() + // -Must have a body. + if (!owner.current) + return FALSE + // Taken from /steal in objective.dm + var/list/all_items = owner.current.GetAllContents() // Includes items inside other items. + var/itemcount = FALSE + for(var/obj/I in all_items) //Check for items + if(I == /obj/item/organ/heart) + itemcount ++ + if (itemcount >= target_amount) // Got the right amount? + return TRUE + + return FALSE + +///////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////// +///////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////// + +/datum/objective/bloodsucker/survive + martyr_compatible = FALSE + + +// EXPLANATION +/datum/objective/bloodsucker/survive/update_explanation_text() + explanation_text = "Survive the entire shift without succumbing to Final Death." + +// WIN CONDITIONS? +/datum/objective/bloodsucker/survive/check_completion() + // -Must have a body. + if (!owner.current || !isliving(owner.current)) + return FALSE + // Dead, without a head or heart? Cya + return owner.current.stat != DEAD// || owner.current.HaveBloodsuckerBodyparts() + +///////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////// +///////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////// + +/datum/objective/bloodsucker/vamphunter + +// GENERATE! +/datum/objective/bloodsucker/vamphunter/generate_objective() + update_explanation_text() + +// EXPLANATION +/datum/objective/bloodsucker/vamphunter/update_explanation_text() + explanation_text = "Destroy all Bloodsuckers on [station_name()]." + +// WIN CONDITIONS? +/datum/objective/bloodsucker/vamphunter/check_completion() + for (var/datum/mind/M in SSticker.mode.bloodsuckers) + if (M && M.current && M.current.stat != DEAD && get_turf(M.current)) + return FALSE + return TRUE + +///////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////// +///////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////// + +/datum/objective/bloodsucker/monsterhunter + +// GENERATE! +/datum/objective/bloodsucker/monsterhunter/generate_objective() + update_explanation_text() + +// EXPLANATION +/datum/objective/bloodsucker/monsterhunter/update_explanation_text() + explanation_text = "Destroy all monsters on [station_name()]." + +// WIN CONDITIONS? +/datum/objective/bloodsucker/monsterhunter/check_completion() + var/list/datum/mind/monsters = list() + monsters += SSticker.mode.bloodsuckers + monsters += SSticker.mode.devils + monsters += SSticker.mode.cult + monsters += SSticker.mode.wizards + monsters += SSticker.mode.apprentices + //monsters += SSticker.mode.servants_of_ratvar + //monsters += SSticker.mode.changelings disabled anyways + + for (var/datum/mind/M in monsters) + if (M && M != owner && M.current && M.current.stat != DEAD && get_turf(M.current)) + return FALSE + return TRUE + + +///////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////// +///////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////// + +/datum/objective/bloodsucker/vassal + +// GENERATE! +/datum/objective/bloodsucker/vassal/generate_objective() + update_explanation_text() + +// EXPLANATION +/datum/objective/bloodsucker/vassal/update_explanation_text() + explanation_text = "Guarantee the success of your Master's mission!" + +// WIN CONDITIONS? +/datum/objective/bloodsucker/vassal/check_completion() + var/datum/antagonist/vassal/antag_datum = owner.has_antag_datum(ANTAG_DATUM_VASSAL) + return antag_datum.master && antag_datum.master.owner && antag_datum.master.owner.current && antag_datum.master.owner.current.stat != DEAD diff --git a/code/modules/antagonists/bloodsucker/bloodsucker_powers.dm b/code/modules/antagonists/bloodsucker/bloodsucker_powers.dm new file mode 100644 index 0000000000..dffdeaf7fc --- /dev/null +++ b/code/modules/antagonists/bloodsucker/bloodsucker_powers.dm @@ -0,0 +1,284 @@ +/datum/action/bloodsucker + name = "Vampiric Gift" + desc = "A vampiric gift." + button_icon = 'icons/mob/actions/bloodsucker.dmi' //This is the file for the BACKGROUND icon + background_icon_state = "vamp_power_off" //And this is the state for the background icon + var/background_icon_state_on = "vamp_power_on" // FULP: Our "ON" icon alternative. + var/background_icon_state_off = "vamp_power_off" // FULP: Our "OFF" icon alternative. + icon_icon = 'icons/mob/actions/bloodsucker.dmi' //This is the file for the ACTION icon + button_icon_state = "power_feed" //And this is the state for the action icon + buttontooltipstyle = "cult" + + // Action-Related + //var/amPassive = FALSE // REMOVED: Just made it its own kind. // Am I just "on" at all times? (aka NO ICON) + var/amTargetted = FALSE // Am I asked to choose a target when enabled? (Shows as toggled ON when armed) + var/amToggle = FALSE // Can I be actively turned on and off? + var/amSingleUse = FALSE // Am I removed after a single use? + var/active = FALSE + var/cooldown = 20 // 10 ticks, 1 second. + var/cooldownUntil = 0 // From action.dm: next_use_time = world.time + cooldown_time + // Power-Related + var/level_current = 0 // Can increase to yield new abilities. Each power goes up in strength each Rank. + //var/level_max = 1 // + var/bloodcost = 10 + var/needs_button = TRUE // Taken from Changeling - for passive abilities that dont need a button + var/bloodsucker_can_buy = FALSE // Must be a bloodsucker to use this power. + var/warn_constant_cost = FALSE // Some powers charge you for staying on. Masquerade, Cloak, Veil, etc. + var/can_use_in_torpor = FALSE // Most powers don't function if you're in torpor. + var/must_be_capacitated = FALSE // Some powers require you to be standing and ready. + var/can_be_immobilized = FALSE // Brawn can be used when incapacitated/laying if it's because you're being immobilized. NOTE: If must_be_capacitated is FALSE, this is irrelevant. + var/can_be_staked = FALSE // Only Feed can happen with a stake in you. + var/cooldown_static = FALSE // Feed, Masquerade, and One-Shot powers don't improve their cooldown. + //var/not_bloodsucker = FALSE // This goes to Vassals or Hunters, but NOT bloodsuckers. + +/datum/action/bloodsucker/New() + if (bloodcost > 0) + desc += "
COST: [bloodcost] Blood" // Modify description to add cost. + if (warn_constant_cost) + desc += "
Your over-time blood consumption increases while [name] is active." + if (amSingleUse) + desc += "
Useable once per night." + ..() + +// NOTES +// +// click.dm <--- Where we can take over mouse clicks +// spells.dm /add_ranged_ability() <--- How we take over the mouse click to use a power on a target. + +/datum/action/bloodsucker/Trigger() + // Active? DEACTIVATE AND END! + if (active && CheckCanDeactivate(TRUE)) + DeactivatePower() + return + if (!CheckCanPayCost(TRUE) || !CheckCanUse(TRUE)) + return + PayCost() + if (amToggle) + active = !active + UpdateButtonIcon() + if (!amToggle || !active) + StartCooldown() // Must come AFTER UpdateButton(), otherwise icon will revert. + ActivatePower() // NOTE: ActivatePower() freezes this power in place until it ends. + if (active) // Did we not manually disable? Handle it here. + DeactivatePower() + if (amSingleUse) + RemoveAfterUse() + +/datum/action/bloodsucker/proc/CheckCanPayCost(display_error) + if(!owner || !owner.mind) + return FALSE + // Cooldown? + if (cooldownUntil > world.time) + if (display_error) + to_chat(owner, "[src] is unavailable. Wait [(cooldownUntil - world.time) / 10] seconds.") + return FALSE + // Have enough blood? + var/mob/living/L = owner + if (L.blood_volume < bloodcost) + if (display_error) + to_chat(owner, "You need at least [bloodcost] blood to activate [name]") + return FALSE + return TRUE + +/datum/action/bloodsucker/proc/CheckCanUse(display_error) // These checks can be scanned every frame while a ranged power is on. + if(!owner || !owner.mind) + return FALSE + // Torpor? + if(!can_use_in_torpor && HAS_TRAIT(owner, TRAIT_DEATHCOMA)) + if(display_error) + to_chat(owner, "Not while you're in Torpor.") + return FALSE + // Stake? + if(!can_be_staked && owner.AmStaked()) + if(display_error) + to_chat(owner, "You have a stake in your chest! Your powers are useless.") + return FALSE + // Incap? + if(must_be_capacitated) + var/mob/living/L = owner + if (L.incapacitated(TRUE, TRUE) || L.resting && !can_be_immobilized) + if(display_error) + to_chat(owner, "Not while you're incapacitated!") + return FALSE + // Constant Cost (out of blood) + if(warn_constant_cost) + var/mob/living/L = owner + if(L.blood_volume <= 0) + if(display_error) + to_chat(owner, "You don't have the blood to upkeep [src].") + return FALSE + return TRUE + +/datum/action/bloodsucker/proc/StartCooldown() + set waitfor = FALSE + // Alpha Out + button.color = rgb(128,0,0,128) + button.alpha = 100 + // Calculate Cooldown (by power's level) + var/this_cooldown = (cooldown_static || amSingleUse) ? cooldown : max(cooldown / 2, cooldown - (cooldown / 16 * (level_current-1))) + // NOTE: With this formula, you'll hit half cooldown at level 8 for that power. + + // Wait for cooldown + cooldownUntil = world.time + this_cooldown + spawn(this_cooldown) + // Alpha In + button.color = rgb(255,255,255,255) + button.alpha = 255 + +/datum/action/bloodsucker/proc/CheckCanDeactivate(display_error) + return TRUE + +/datum/action/bloodsucker/UpdateButtonIcon(force = FALSE) + background_icon_state = active? background_icon_state_on : background_icon_state_off + ..()//UpdateButtonIcon() + + +/datum/action/bloodsucker/proc/PayCost() + // owner for actions is the mob, not mind. + var/mob/living/L = owner + L.blood_volume -= bloodcost + + +/datum/action/bloodsucker/proc/ActivatePower() + + +/datum/action/bloodsucker/proc/DeactivatePower(mob/living/user = owner, mob/living/target) + active = FALSE + UpdateButtonIcon() + StartCooldown() + +/datum/action/bloodsucker/proc/ContinueActive(mob/living/user, mob/living/target) // Used by loops to make sure this power can stay active. + return active && user && (!warn_constant_cost || user.blood_volume > 0) + +/datum/action/bloodsucker/proc/RemoveAfterUse() + // Un-Learn Me! (GO HOME + var/datum/antagonist/bloodsucker/bloodsuckerdatum = owner.mind.has_antag_datum(ANTAG_DATUM_BLOODSUCKER) + if (istype(bloodsuckerdatum)) + bloodsuckerdatum.powers -= src + Remove(owner) + +/datum/action/bloodsucker/proc/Upgrade() + level_current ++ + +/////////////////////////////////// PASSIVE POWERS /////////////////////////////////// + +// New Type: Passive (Always on, no button) +/datum/action/bloodsucker/passive + +/datum/action/bloodsucker/passive/New() + // REMOVED: DO NOTHBING! + ..() + // Don't Display Button! (it doesn't do anything anyhow) + button.screen_loc = DEFAULT_BLOODSPELLS + button.moved = DEFAULT_BLOODSPELLS + button.ordered = FALSE +/datum/action/bloodsucker/passive/Destroy() + if(owner) + Remove(owner) + target = null + +/////////////////////////////////// TARGETTED POWERS /////////////////////////////////// + +/datum/action/bloodsucker/targeted + // NOTE: All Targeted spells are Toggles! We just don't bother checking here. + var/target_range = 99 + var/message_Trigger = "Select a target." + var/obj/effect/proc_holder/bloodsucker/bs_proc_holder + var/power_activates_immediately = TRUE // Most powers happen the moment you click. Some, like Mesmerize, require time and shouldn't cost you if they fail. + + var/power_in_use = FALSE // Is this power LOCKED due to being used? + +/datum/action/bloodsucker/targeted/New(Target) + desc += "
\[Targeted Power\]" // Modify description to add notice that this is aimed. + ..() + // Create Proc Holder for intercepting clicks + bs_proc_holder = new () + bs_proc_holder.linked_power = src + +// Click power: Begin Aim +/datum/action/bloodsucker/targeted/Trigger() + if(active && CheckCanDeactivate(TRUE)) + DeactivateRangedAbility() + DeactivatePower() + return + if(!CheckCanPayCost(TRUE) || !CheckCanUse(TRUE)) + return + active = !active + UpdateButtonIcon() + // Create & Link Targeting Proc + var/mob/living/L = owner + if(L.ranged_ability) + L.ranged_ability.remove_ranged_ability() + bs_proc_holder.add_ranged_ability(L) + + if(message_Trigger != "") + to_chat(owner, "[message_Trigger]") + +/datum/action/bloodsucker/targeted/CheckCanUse(display_error) + . = ..() + if(!.) + return + if(!owner.client) // <--- We don't allow non client usage so that using powers like mesmerize will FAIL if you try to use them as ghost. Why? because ranged_abvility in spell.dm + return FALSE // doesn't let you remove powers if you're not there. So, let's just cancel the power entirely. + return TRUE + +/datum/action/bloodsucker/targeted/DeactivatePower(mob/living/user = owner, mob/living/target) + // Don't run ..(), we don't want to engage the cooldown until we USE this power! + active = FALSE + UpdateButtonIcon() + +/datum/action/bloodsucker/targeted/proc/DeactivateRangedAbility() + // Only Turned off when CLICK is disabled...aka, when you successfully clicked (or + bs_proc_holder.remove_ranged_ability() + +// Check if target is VALID (wall, turf, or character?) +/datum/action/bloodsucker/targeted/proc/CheckValidTarget(atom/A) + return FALSE // FALSE targets nothing. + +// Check if valid target meets conditions +/datum/action/bloodsucker/targeted/proc/CheckCanTarget(atom/A, display_error) + // Out of Range + if(!(A in view(target_range, owner))) + if(display_error && target_range > 1) // Only warn for range if it's greater than 1. Brawn doesn't need to announce itself. + to_chat(owner, "Your target is out of range.") + return FALSE + return istype(A) + +// Click Target +/datum/action/bloodsucker/targeted/proc/ClickWithPower(atom/A) + // CANCEL RANGED TARGET check + if(power_in_use || !CheckValidTarget(A)) + return FALSE + // Valid? (return true means DON'T cancel power!) + if(!CheckCanPayCost(TRUE) || !CheckCanUse(TRUE) || !CheckCanTarget(A, TRUE)) + return TRUE + // Skip this part so we can return TRUE right away. + if(power_activates_immediately) + PowerActivatedSuccessfully() // Mesmerize pays only after success. + power_in_use = TRUE // Lock us into this ability until it successfully fires off. Otherwise, we pay the blood even if we fail. + FireTargetedPower(A) // We use this instead of ActivatePower(), which has no input + power_in_use = FALSE + return TRUE + +/datum/action/bloodsucker/targeted/proc/FireTargetedPower(atom/A) + // Like ActivatePower, but specific to Targeted (and takes an atom input). We don't use ActivatePower for targeted. + +/datum/action/bloodsucker/targeted/proc/PowerActivatedSuccessfully() + // The power went off! We now pay the cost of the power. + PayCost() + DeactivateRangedAbility() + DeactivatePower() + StartCooldown() // Do AFTER UpdateIcon() inside of DeactivatePower. Otherwise icon just gets wiped. + +/datum/action/bloodsucker/targeted/ContinueActive(mob/living/user, mob/living/target) // Used by loops to make sure this power can stay active. + return ..() +// Target Proc Holder +/obj/effect/proc_holder/bloodsucker + var/datum/action/bloodsucker/targeted/linked_power + +/obj/effect/proc_holder/bloodsucker/remove_ranged_ability(msg) + ..() + linked_power.DeactivatePower() + +/obj/effect/proc_holder/bloodsucker/InterceptClickOn(mob/living/caller, params, atom/A) + return linked_power.ClickWithPower(A) diff --git a/code/modules/antagonists/bloodsucker/bloodsucker_sunlight.dm b/code/modules/antagonists/bloodsucker/bloodsucker_sunlight.dm new file mode 100644 index 0000000000..bb6e2a69f9 --- /dev/null +++ b/code/modules/antagonists/bloodsucker/bloodsucker_sunlight.dm @@ -0,0 +1,195 @@ +#define TIME_BLOODSUCKER_NIGHT 900 // 15 minutes +#define TIME_BLOODSUCKER_DAY_WARN 90 // 1.5 minutes +#define TIME_BLOODSUCKER_DAY_FINAL_WARN 25 // 25 sec +#define TIME_BLOODSUCKER_DAY 60 // 1.5 minutes // 10 is a second, 600 is a minute. +#define TIME_BLOODSUCKER_BURN_INTERVAL 40 // 4 sec + + +// Over Time, tick down toward a "Solar Flare" of UV buffeting the station. This period is harmful to vamps. +/obj/effect/sunlight + //var/amDay = FALSE + var/cancel_me = FALSE + var/amDay = FALSE + var/time_til_cycle = 0 + +/obj/effect/sunlight/Initialize() + countdown() + hud_tick() + +/obj/effect/sunlight/proc/countdown() + set waitfor = FALSE + + while(!cancel_me) + + time_til_cycle = TIME_BLOODSUCKER_NIGHT + + // Part 1: Night (all is well) + while(time_til_cycle > TIME_BLOODSUCKER_DAY_WARN) + sleep(10) + if(cancel_me) + return + //sleep(TIME_BLOODSUCKER_NIGHT - TIME_BLOODSUCKER_DAY_WARN) + warn_daylight(1,"Solar Flares will bombard the station with dangerous UV in [TIME_BLOODSUCKER_DAY_WARN / 60] minutes. Prepare to seek cover in a coffin or closet.") // time2text <-- use Help On + give_home_power() // Give VANISHING ACT power to all vamps with a lair! + + // Part 2: Night Ending + while(time_til_cycle > TIME_BLOODSUCKER_DAY_FINAL_WARN) + sleep(10) + if(cancel_me) + return + //sleep(TIME_BLOODSUCKER_DAY_WARN - TIME_BLOODSUCKER_DAY_FINAL_WARN) + message_admins("BLOODSUCKER NOTICE: Daylight beginning in [TIME_BLOODSUCKER_DAY_FINAL_WARN] seconds.)") + warn_daylight(2,"Solar Flares are about to bombard the station! You have [TIME_BLOODSUCKER_DAY_FINAL_WARN] seconds to find cover!",\ + "In [TIME_BLOODSUCKER_DAY_FINAL_WARN / 10], your master will be at risk of a Solar Flare. Make sure they find cover!") + + // (FINAL LIL WARNING) + while(time_til_cycle > 5) + sleep(10) + if (cancel_me) + return + //sleep(TIME_BLOODSUCKER_DAY_FINAL_WARN - 50) + warn_daylight(3,"Seek cover, for Sol rises!") + + // Part 3: Night Ending + while (time_til_cycle > 0) + sleep(10) + if (cancel_me) + return + //sleep(50) + warn_daylight(4,"Solar flares bombard the station with deadly UV light!
Stay in cover for the next [TIME_BLOODSUCKER_DAY / 60] minutes or risk Final Death!",\ + "Solar flares bombard the station with UV light!") + + // Part 4: Day + amDay = TRUE + message_admins("BLOODSUCKER NOTICE: Daylight Beginning (Lasts for [TIME_BLOODSUCKER_DAY / 60] minutes.)") + time_til_cycle = TIME_BLOODSUCKER_DAY + sleep(10) // One second grace period. + //var/daylight_time = TIME_BLOODSUCKER_DAY + var/issued_XP = FALSE + while(time_til_cycle > 0) + punish_vamps() + sleep(TIME_BLOODSUCKER_BURN_INTERVAL) + if (cancel_me) + return + //daylight_time -= TIME_BLOODSUCKER_BURN_INTERVAL + // Issue Level Up! + if(!issued_XP && time_til_cycle <= 15) + issued_XP = TRUE + vamps_rank_up() + + warn_daylight(5,"The solar flare has ended, and the daylight danger has passed...for now.",\ + "The solar flare has ended, and the daylight danger has passed...for now.") + amDay = FALSE + day_end() // Remove VANISHING ACT power from all vamps who have it! Clear Warnings (sunlight, locker protection) + message_admins("BLOODSUCKER NOTICE: Daylight Ended. Resetting to Night (Lasts for [TIME_BLOODSUCKER_NIGHT / 60] minutes.)") + + +/obj/effect/sunlight/proc/hud_tick() + set waitfor = FALSE + while(!cancel_me) + // Update all Bloodsucker sunlight huds + for(var/datum/mind/M in SSticker.mode.bloodsuckers) + if(!istype(M) || !istype(M.current)) + continue + var/datum/antagonist/bloodsucker/bloodsuckerdatum = M.has_antag_datum(ANTAG_DATUM_BLOODSUCKER) + if(istype(bloodsuckerdatum)) + bloodsuckerdatum.update_sunlight(max(0, time_til_cycle), amDay) // This pings all HUDs + sleep(10) + time_til_cycle -- + +/obj/effect/sunlight/proc/warn_daylight(danger_level=0, vampwarn = "", vassalwarn = "") + for(var/datum/mind/M in SSticker.mode.bloodsuckers) + if(!istype(M)) + continue + to_chat(M,vampwarn) + if(M.current) + if(danger_level == 1) + M.current.playsound_local(null, 'sound/chatter/griffin_3.ogg', 50 + danger_level, 1) + else if(danger_level == 2) + M.current.playsound_local(null, 'sound/chatter/griffin_5.ogg', 50 + danger_level, 1) + else if(danger_level == 3) + M.current.playsound_local(null, 'sound/effects/alert.ogg', 75, 1) + else if(danger_level == 4) + M.current.playsound_local(null, 'sound/ambience/ambimystery.ogg', 100, 1) + else if(danger_level == 5) + M.current.playsound_local(null, 'sound/spookoween/ghosty_wind.ogg', 90, 1) + + if(vassalwarn != "") + for(var/datum/mind/M in SSticker.mode.vassals) + if(!istype(M)) + continue + to_chat(M,vassalwarn) + + +/obj/effect/sunlight/proc/punish_vamps() + // Cycle through all vamp antags and check if they're inside a closet. + for(var/datum/mind/M in SSticker.mode.bloodsuckers) + if(!istype(M) || !istype(M.current)) + continue + var/datum/antagonist/bloodsucker/bloodsuckerdatum = M.has_antag_datum(ANTAG_DATUM_BLOODSUCKER) + if(!istype(bloodsuckerdatum)) + continue + // Closets offer SOME protection + if(istype(M.current.loc, /obj/structure)) + // Coffins offer the BEST protection + if(istype(M.current.loc, /obj/structure/closet/crate/coffin)) + SEND_SIGNAL(M.current, COMSIG_ADD_MOOD_EVENT, "vampsleep", /datum/mood_event/coffinsleep) + continue + else + if(!bloodsuckerdatum.warn_sun_locker) + to_chat(M, "Your skin sizzles. The [M.current.loc] doesn't protect well against UV bombardment.") + bloodsuckerdatum.warn_sun_locker = TRUE + M.current.adjustFireLoss(0.5 + bloodsuckerdatum.vamplevel / 2) // M.current.fireloss += 0.5 + bloodsuckerdatum.vamplevel / 2 // Do DIRECT damage. Being spaced was causing this to not occur. setFireLoss(bloodsuckerdatum.vamplevel) + M.current.updatehealth() + SEND_SIGNAL(M.current, COMSIG_ADD_MOOD_EVENT, "vampsleep", /datum/mood_event/daylight_1) + // Out in the Open? Buh Bye + else + if(!bloodsuckerdatum.warn_sun_burn) + if(bloodsuckerdatum.vamplevel > 0) + to_chat(M, "The solar flare sets your skin ablaze!") + else + to_chat(M, "The solar flare scalds your neophyte skin!") + bloodsuckerdatum.warn_sun_burn = TRUE + if(M.current.fire_stacks <= 0) + M.current.fire_stacks = 0 + if(bloodsuckerdatum.vamplevel > 0) + M.current.adjust_fire_stacks(0.2 + bloodsuckerdatum.vamplevel / 10) + M.current.IgniteMob() + M.current.adjustFireLoss(2 + bloodsuckerdatum.vamplevel) // M.current.fireloss += 2 + bloodsuckerdatum.vamplevel // Do DIRECT damage. Being spaced was causing this to not occur. //setFireLoss(2 + bloodsuckerdatum.vamplevel) + M.current.updatehealth() + SEND_SIGNAL(M.current, COMSIG_ADD_MOOD_EVENT, "vampsleep", /datum/mood_event/daylight_2) + +/obj/effect/sunlight/proc/day_end() + for(var/datum/mind/M in SSticker.mode.bloodsuckers) + if(!istype(M) || !istype(M.current)) + continue + var/datum/antagonist/bloodsucker/bloodsuckerdatum = M.has_antag_datum(ANTAG_DATUM_BLOODSUCKER) + if(!istype(bloodsuckerdatum)) + continue + // Reset Warnings + bloodsuckerdatum.warn_sun_locker = FALSE + bloodsuckerdatum.warn_sun_burn = FALSE + // Remove Dawn Powers + for(var/datum/action/bloodsucker/P in bloodsuckerdatum.powers) + if(istype(P, /datum/action/bloodsucker/gohome)) + bloodsuckerdatum.powers -= P + P.Remove(M.current) + +/obj/effect/sunlight/proc/vamps_rank_up() + set waitfor = FALSE + // Cycle through all vamp antags and check if they're inside a closet. + for(var/datum/mind/M in SSticker.mode.bloodsuckers) + if(!istype(M) || !istype(M.current)) + continue + var/datum/antagonist/bloodsucker/bloodsuckerdatum = M.has_antag_datum(ANTAG_DATUM_BLOODSUCKER) + if(istype(bloodsuckerdatum)) + bloodsuckerdatum.RankUp() // Rank up! Must still be in a coffin to level! + +/obj/effect/sunlight/proc/give_home_power() + // It's late...! Give the "Vanishing Act" gohome power to bloodsuckers. + for(var/datum/mind/M in SSticker.mode.bloodsuckers) + if(!istype(M) || !istype(M.current)) + continue + var/datum/antagonist/bloodsucker/bloodsuckerdatum = M.has_antag_datum(ANTAG_DATUM_BLOODSUCKER) + if(istype(bloodsuckerdatum) && bloodsuckerdatum.lair && !(locate(/datum/action/bloodsucker/gohome) in bloodsuckerdatum.powers)) + bloodsuckerdatum.BuyPower(new /datum/action/bloodsucker/gohome) diff --git a/code/modules/antagonists/bloodsucker/bloodsucker_ui.dm b/code/modules/antagonists/bloodsucker/bloodsucker_ui.dm new file mode 100644 index 0000000000..b922af6066 --- /dev/null +++ b/code/modules/antagonists/bloodsucker/bloodsucker_ui.dm @@ -0,0 +1,116 @@ + + +// For all things visual, such as leveling up + + +// Look up: _vending.dm proc/ui_interact() +// Malf_Modules.dm proc/use() + +/* +/datum/antagonist/bloodsucker/proc/LevelUpMenu() + var/list/dat = list() + + dat += "
You have become more ancient.
Direct the path of your blood
"
+ dat += "" + + // Step One: Decide powers you CAN buy. + for(var/pickedpower in typesof(/datum/action/bloodsucker)) + var/obj/effect/proc_holder/spell/bloodsucker/power = pickedpower + // NAME + dat += "[power.name]" + // COST + dat += "
" + + var/datum/browser/popup = new(owner.current, "bloodsuckerrank", "Bloodsucker Rank Up") + popup.set_content(dat.Join()) + popup.open() + +/datum/antagonist/bloodsucker/Topic(href, href_list) + if(..()) + return +*/ + + +// From browser.dm: /datum/browser/New(nuser, nwindow_id, ntitle = 0, nwidth = 0, nheight = 0, var/atom/nref = null) + + +/* + var/list/dat = list() + dat += "Select use of processing time: (currently #[processing_time] left.)
" + dat += "
" + dat += "Install Module:
" + dat += "The number afterwards is the amount of processing time it consumes.
" + for(var/datum/AI_Module/large/module in possible_modules) + dat += "[module.module_name]\[?\] ([module.cost])
" + for(var/datum/AI_Module/small/module in possible_modules) + dat += "[module.module_name]\[?\] ([module.cost])
" + dat += "
" + if(temp) + dat += "[temp]" + var/datum/browser/popup = new(user, "modpicker", "Malf Module Menu") + popup.set_content(dat.Join()) + popup.open() +*/ + +/* + var/dat = "" + var/datum/bank_account/account + var/mob/living/carbon/human/H + var/obj/item/card/id/C + if(ishuman(user)) + H = user + C = H.get_idcard(TRUE) + + if(!C) + dat += "
No ID Card detected!
" + else if (!C.registered_account) + dat += "No account on registered ID card!
" + if(onstation && C && C.registered_account) + account = C.registered_account + dat += "Select an item
" + dat += ""
+ if(!product_records.len)
+ dat += "No product loaded!"
+ else
+ var/list/display_records = product_records + coin_records
+ if(extended_inventory)
+ display_records = product_records + coin_records + hidden_records
+ dat += ""
+ for (var/datum/data/vending_product/R in display_records)
+ var/price_listed = "$[default_price]"
+ var/is_hidden = hidden_records.Find(R)
+ if(is_hidden && !extended_inventory)
+ continue
+ if(R.custom_price)
+ price_listed = "$[R.custom_price]"
+ if(!onstation || account && account.account_job && account.account_job.paycheck_department == payment_department)
+ price_listed = "FREE"
+ if(coin_records.Find(R) || is_hidden)
+ price_listed = "$[R.custom_premium_price ? R.custom_premium_price : extra_price]"
+ dat += "
"
+ dat += "
"
+ if(onstation && C && C.registered_account)
+ dat += "Balance: $[account.account_balance]"
+ if(istype(src, /obj/machinery/vending/snack))
+ dat += "]) | "
+ dat += "[sanitize(R.name)] ([price_listed]) | " + if(R.amount > 0 && ((C && C.registered_account && onstation) || (!onstation && isliving(user)))) + dat += "[R.amount] Vend | " + else + dat += "Not Available | " + dat += "
Chef's Food Selection
" + dat += ""
+ for (var/O in dish_quants)
+ if(dish_quants[O] > 0)
+ var/N = dish_quants[O]
+ dat += "Dispense "
+ dat += "[capitalize(O)] ($[default_price]): [N]
" + dat += "
"
+
+ var/datum/browser/popup = new(user, "vending", (name))
+ popup.set_content(dat)
+ popup.set_title_image(user.browse_rsc_icon(icon, icon_state))
+ popup.open()
+*/
\ No newline at end of file
diff --git a/code/modules/antagonists/bloodsucker/datum_bloodsucker.dm b/code/modules/antagonists/bloodsucker/datum_bloodsucker.dm
new file mode 100644
index 0000000000..febf53c324
--- /dev/null
+++ b/code/modules/antagonists/bloodsucker/datum_bloodsucker.dm
@@ -0,0 +1,765 @@
+/datum/team/vampireclan
+ name = "Clan" // Teravanni,
+
+/datum/antagonist/bloodsucker
+ name = "Bloodsucker"
+ roundend_category = "bloodsuckers"
+ antagpanel_category = "Bloodsucker"
+ job_rank = ROLE_BLOODSUCKER
+
+ // NAME
+ var/vampname // My Dracula name
+ var/vamptitle // My Dracula title
+ var/vampreputation // My "Surname" or description of my deeds
+ // CLAN
+ var/datum/team/vampireclan/clan
+ var/list/datum/antagonist/vassal/vassals = list()// Vassals under my control. Periodically remove the dead ones.
+ var/datum/mind/creator // Who made me? For both Vassals AND Bloodsuckers (though Master Vamps won't have one)
+ // POWERS
+ var/list/datum/action/powers = list()// Purchased powers
+ var/poweron_feed = FALSE // Am I feeding?
+ var/poweron_masquerade = FALSE
+ // STATS
+ var/vamplevel = 0
+ var/vamplevel_unspent = 1
+ var/regenRate = 0.3 // How many points of Brute do I heal per tick?
+ var/feedAmount = 15 // Amount of blood drawn from a target per tick.
+ var/maxBloodVolume = 600 // Maximum blood a Vamp can hold via feeding. // BLOOD_VOLUME_NORMAL 550 // BLOOD_VOLUME_SAFE 475 //BLOOD_VOLUME_OKAY 336 //BLOOD_VOLUME_BAD 224 // BLOOD_VOLUME_SURVIVE 122
+ // OBJECTIVES
+ var/list/datum/objective/objectives_given = list() // For removal if needed.
+ var/area/lair
+ var/obj/structure/closet/crate/coffin
+ // TRACKING
+ var/foodInGut = 0 // How much food to throw up later. You shouldn't have eaten that.
+ var/warn_sun_locker = FALSE // So we only get the locker burn message once per day.
+ var/warn_sun_burn = FALSE // So we only get the sun burn message once per day.
+ var/had_toxlover = FALSE
+ // LISTS
+ var/static/list/defaultTraits = list (TRAIT_STABLEHEART, TRAIT_NOBREATH, TRAIT_SLEEPIMMUNE, TRAIT_NOCRITDAMAGE, TRAIT_RESISTCOLD, TRAIT_RADIMMUNE, TRAIT_VIRUSIMMUNE, TRAIT_NIGHT_VISION, \
+ TRAIT_NOSOFTCRIT, TRAIT_NOHARDCRIT, TRAIT_AGEUSIA, TRAIT_COLDBLOODED, TRAIT_NONATURALHEAL, TRAIT_NOMARROW, TRAIT_NOPULSE, TRAIT_NOCLONE)
+ // NOTES: TRAIT_AGEUSIA <-- Doesn't like flavors.
+ // REMOVED: TRAIT_NODEATH
+ // TO ADD:
+ //var/static/list/defaultOrgans = list (/obj/item/organ/heart/vampheart,/obj/item/organ/heart/vampeyes)
+
+/datum/antagonist/bloodsucker/on_gain()
+ SSticker.mode.bloodsuckers |= owner // Add if not already in here (and you might be, if you were picked at round start)
+ SSticker.mode.check_start_sunlight()// Start Sunlight? (if first Vamp)
+ SelectFirstName()// Name & Title
+ SelectTitle(am_fledgling=TRUE) // If I have a creator, then set as Fledgling.
+ SelectReputation(am_fledgling=TRUE)
+ AssignStarterPowersAndStats()// Give Powers & Stats
+ forge_bloodsucker_objectives()// Objectives & Team
+ update_bloodsucker_icons_added(owner.current, "bloodsucker") // Add Antag HUD
+ LifeTick() // Run Life Function
+ . = ..()
+
+
+/datum/antagonist/bloodsucker/on_removal()
+ SSticker.mode.bloodsuckers -= owner
+ SSticker.mode.check_cancel_sunlight()// End Sunlight? (if last Vamp)
+ ClearAllPowersAndStats()// Clear Powers & Stats
+ clear_bloodsucker_objectives() // Objectives
+ update_bloodsucker_icons_removed(owner.current)// Clear Antag HUD
+ . = ..()
+
+
+
+/datum/antagonist/bloodsucker/greet()
+ var/fullname = ReturnFullName(TRUE)
+ to_chat(owner, "You are [fullname], a bloodsucking vampire!" + dat += "
") + owner.announce_objectives() + to_chat(owner, "* You regenerate your health slowly, you're weak to fire, and you depend on blood to survive. Allow your stolen blood to run too low, and you will find yourself at \ + risk of being discovered!
") + //to_chat(owner, "As an immortal, your power is linked to your age. The older you grow, the more abilities you will have access to.") + var/vamp_greet + vamp_greet += "* Other Bloodsuckers are not necessarily your friends, but your survival may depend on cooperation. Betray them at your own discretion and peril.
" + vamp_greet += "* Use \",b\" to speak your ancient Bloodsucker language.
" + vamp_greet += "Bloodsucker Tip: Rest in a Coffin to claim it, and that area, as your lair.
" + vamp_greet += "Bloodsucker Tip: Fear the daylight! Solar flares will bombard the station periodically, and only your coffin can guarantee your safety.
" + vamp_greet += "Bloodsucker Tip: You wont loose blood if you are unconcious or sleeping. Use this to your advantage to conserve blood.
" + to_chat(owner, vamp_greet) + + owner.current.playsound_local(null, 'sound/bloodsucker/BloodsuckerAlert.ogg', 100, FALSE, pressure_affected = FALSE) + antag_memory += "Although you were born a mortal, in un-death you earned the name [fullname].
" + + +/datum/antagonist/bloodsucker/farewell() + owner.current.visible_message("[owner.current]'s skin flushes with color, their eyes growing glossier. They look...alive.",\ + "With a snap, your curse has ended. You are no longer a Bloodsucker. You live once more!") + // Refill with Blood + owner.current.blood_volume = max(owner.current.blood_volume,BLOOD_VOLUME_SAFE) + + + + +//////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////// + + +/datum/antagonist/bloodsucker/proc/SelectFirstName() + // Names (EVERYONE gets one)) + if (owner.current.gender == MALE) + vampname = pick("Desmond","Rudolph","Dracul","Vlad","Pyotr","Gregor","Cristian","Christoff","Marcu","Andrei","Constantin","Gheorghe","Grigore","Ilie","Iacob","Luca","Mihail","Pavel","Vasile","Octavian","Sorin", \ + "Sveyn","Aurel","Alexe","Iustin","Theodor","Dimitrie","Octav","Damien","Magnus","Caine","Abel", // Romanian/Ancient + "Lucius","Gaius","Otho","Balbinus","Arcadius","Romanos","Alexios","Vitellius", // Latin + "Melanthus","Teuthras","Orchamus","Amyntor","Axion", // Greek + "Thoth","Thutmose","Osorkon,","Nofret","Minmotu","Khafra", // Egyptian + "Dio") + + else + vampname = pick("Islana","Tyrra","Greganna","Pytra","Hilda","Andra","Crina","Viorela","Viorica","Anemona","Camelia","Narcisa","Sorina","Alessia","Sophia","Gladda","Arcana","Morgan","Lasarra","Ioana","Elena", \ + "Alina","Rodica","Teodora","Denisa","Mihaela","Svetla","Stefania","Diyana","Kelssa","Lilith", // Romanian/Ancient + "Alexia","Athanasia","Callista","Karena","Nephele","Scylla","Ursa", // Latin + "Alcestis","Damaris","Elisavet","Khthonia","Teodora", // Greek + "Nefret","Ankhesenpep") // Egyptian + +/datum/antagonist/bloodsucker/proc/SelectTitle(am_fledgling = 0, forced = FALSE) + // Already have Title + if (!forced && vamptitle != null) + return + // Titles [Master] + if (!am_fledgling) + if (owner.current.gender == MALE) + vamptitle = pick ("Count","Baron","Viscount","Prince","Duke","Tzar","Dreadlord","Lord","Master") + else + vamptitle = pick ("Countess","Baroness","Viscountess","Princess","Duchess","Tzarina","Dreadlady","Lady","Mistress") + to_chat(owner, "You have earned a title! You are now known as [ReturnFullName(TRUE)]!") + // Titles [Fledgling] + else + vamptitle = null + +/datum/antagonist/bloodsucker/proc/SelectReputation(am_fledgling = 0, forced=FALSE) + // Already have Reputation + if (!forced && vampreputation != null) + return + // Reputations [Master] + if (!am_fledgling) + vampreputation = pick("Butcher","Blood Fiend","Crimson","Red","Black","Terror","Nightman","Feared","Ravenous","Fiend","Malevolent","Wicked","Ancient","Plaguebringer","Sinister","Forgotten","Wretched","Baleful", \ + "Inqisitor","Harvester","Reviled","Robust","Betrayer","Destructor","Damned","Accursed","Terrible","Vicious","Profane","Vile","Depraved","Foul","Slayer","Manslayer","Sovereign","Slaughterer", \ + "Forsaken","Mad","Dragon","Savage","Villainous","Nefarious","Inquisitor","Marauder","Horrible","Immortal","Undying","Overlord","Corrupt","Hellspawn","Tyrant","Sanguineous") + if (owner.current.gender == MALE) + if (prob(10)) // Gender override + vampreputation = pick("King of the Damned", "Blood King", "Emperor of Blades", "Sinlord", "God-King") + else + if (prob(10)) // Gender override + vampreputation = pick("Queen of the Damned", "Blood Queen", "Empress of Blades", "Sinlady", "God-Queen") + + to_chat(owner, "You have earned a reputation! You are now known as [ReturnFullName(TRUE)]!") + + // Reputations [Fledgling] + else + vampreputation = pick ("Crude","Callow","Unlearned","Neophyte","Novice","Unseasoned","Fledgling","Young","Neonate","Scrapling","Untested","Unproven","Unknown","Newly Risen","Born","Scavenger","Unknowing",\ + "Unspoiled","Disgraced","Defrocked","Shamed","Meek","Timid","Broken")//,"Fresh") + + +/datum/antagonist/bloodsucker/proc/AmFledgling() + return !vamptitle + +/datum/antagonist/bloodsucker/proc/ReturnFullName(var/include_rep=0) + + var/fullname + // Name First + fullname = (vampname ? vampname : owner.current.name) + // Title + if(vamptitle) + fullname = vamptitle + " " + fullname + // Rep + if(include_rep && vampreputation) + fullname = fullname + " the " + vampreputation + + return fullname + + +/datum/antagonist/bloodsucker/proc/BuyPower(datum/action/bloodsucker/power)//(obj/effect/proc_holder/spell/power) + powers += power + power.Grant(owner.current)// owner.AddSpell(power) + +/datum/antagonist/bloodsucker/proc/AssignStarterPowersAndStats() + // Blood/Rank Counter + add_hud() + update_hud(TRUE) // Set blood value, current rank + // Powers + BuyPower(new /datum/action/bloodsucker/feed) + BuyPower(new /datum/action/bloodsucker/masquerade) + BuyPower(new /datum/action/bloodsucker/veil) + // Traits + for (var/T in defaultTraits) + ADD_TRAIT(owner.current, T, "bloodsucker") + if(HAS_TRAIT(owner.current, TRAIT_TOXINLOVER)) //No slime bonuses here, no thank you + had_toxlover = TRUE + REMOVE_TRAIT(owner.current, TRAIT_TOXINLOVER, "species") + // Traits: Species + if(ishuman(owner.current)) + var/mob/living/carbon/human/H = owner.current + var/datum/species/S = H.dna.species + S.species_traits |= DRINKSBLOOD + // Clear Addictions + owner.current.reagents.addiction_list = list() // Start over from scratch. Lucky you! At least you're not addicted to blood anymore (if you were) + // Stats + if(ishuman(owner.current)) + var/mob/living/carbon/human/H = owner.current + var/datum/species/S = H.dna.species + // Make Changes + S.brutemod *= 0.5 // <-------------------- Start small, but burn mod increases based on rank! + S.coldmod = 0 + S.stunmod *= 0.25 + S.siemens_coeff *= 0.75 //base electrocution coefficient 1 + //S.heatmod += 0.5 // Heat shouldn't affect. Only Fire. + //S.punchstunthreshold = 8 //damage at which punches from this race will stun 9 + S.punchdamagelow += 1 //lowest possible punch damage 0 + S.punchdamagehigh += 1 //highest possible punch damage 9 + // Clown + if(istype(H) && owner.assigned_role == "Clown") + H.dna.remove_mutation(CLOWNMUT) + to_chat(H, "As a vampiric clown, you are no longer a danger to yourself. Your nature is subdued.") + // Physiology + CheckVampOrgans() // Heart, Eyes + // Language + owner.current.grant_language(/datum/language/vampiric) + // Soul + //owner.current.hellbound = TRUE Causes wierd stuff + owner.hasSoul = FALSE // If false, renders the character unable to sell their soul. + owner.isholy = FALSE // is this person a chaplain or admin role allowed to use bibles + // Disabilities + CureDisabilities() + +/datum/antagonist/bloodsucker/proc/ClearAllPowersAndStats() + // Blood/Rank Counter + remove_hud() + // Powers + while(powers.len) + var/datum/action/bloodsucker/power = pick(powers) + powers -= power + power.Remove(owner.current) + // owner.RemoveSpell(power) + // Traits + for(var/T in defaultTraits) + REMOVE_TRAIT(owner.current, T, "bloodsucker") + if(had_toxlover == TRUE) + ADD_TRAIT(owner.current, TRAIT_TOXINLOVER, "species") + + // Traits: Species + if(ishuman(owner.current)) + var/mob/living/carbon/human/H = owner.current + H.set_species(H.dna.species.type) + // Stats + if(ishuman(owner.current)) + var/mob/living/carbon/human/H = owner.current + H.set_species(H.dna.species.type) + // Clown + if(istype(H) && owner.assigned_role == "Clown") + H.dna.add_mutation(CLOWNMUT) + // NOTE: Use initial() to return things to default! + // Physiology + owner.current.regenerate_organs() + // Update Health + owner.current.setMaxHealth(100) + // Language + owner.current.remove_language(/datum/language/vampiric) + // Soul + if (owner.soulOwner == owner) // Return soul, if *I* own it. + owner.hasSoul = TRUE +//owner.current.hellbound = FALSE + +datum/antagonist/bloodsucker/proc/RankUp() + set waitfor = FALSE + if(!owner || !owner.current) + return + vamplevel_unspent ++ + // Spend Rank Immediately? + if(istype(owner.current.loc, /obj/structure/closet/crate/coffin)) + SpendRank() + else + to_chat(owner, "You have grown more ancient! Sleep in a coffin that you have claimed to thicken your blood and become more powerful.") + if(vamplevel_unspent >= 2) + to_chat(owner, "Bloodsucker Tip: If you cannot find or steal a coffin to use, they can be built from wooden planks.
") + +datum/antagonist/bloodsucker/proc/LevelUpPowers() + for(var/datum/action/bloodsucker/power in powers) + power.level_current ++ + +datum/antagonist/bloodsucker/proc/SpendRank() + set waitfor = FALSE + if (vamplevel_unspent <= 0 || !owner || !owner.current || !owner.current.client) + return + ///////// + // Powers + //TODO: Make this into a radial + // Purchase Power Prompt + var/list/options = list() // Taken from gasmask.dm, for Clown Masks. + for(var/pickedpower in typesof(/datum/action/bloodsucker)) + var/datum/action/bloodsucker/power = pickedpower + // If I don't own it, and I'm allowed to buy it. + if(!(locate(power) in powers) && initial(power.bloodsucker_can_buy)) + options[initial(power.name)] = power // TESTING: After working with TGUI, it seems you can use initial() to view the variables inside a path? + options["\[ Not Now \]"] = null + // Abort? + if(options.len > 1) + var/choice = input(owner.current, "You have the opportunity to grow more ancient. Select a power to advance your Rank.", "Your Blood Thickens...") in options + // Cheat-Safety: Can't keep opening/closing coffin to spam levels + if(vamplevel_unspent <= 0) // Already spent all your points, and tried opening/closing your coffin, pal. + return + if(!istype(owner.current.loc, /obj/structure/closet/crate/coffin)) + to_chat(owner.current, "Return to your coffin to advance your Rank.") + return + if(!choice || !options[choice] || (locate(options[choice]) in powers)) // ADDED: Check to see if you already have this power, due to window stacking. + to_chat(owner.current, "You prevent your blood from thickening just yet, but you may try again later.") + return + // Buy New Powers + var/datum/action/bloodsucker/P = options[choice] + BuyPower(new P) + to_chat(owner.current, "You have learned [initial(P.name)]!") + else + to_chat(owner.current, "You grow more ancient by the night!") + ///////// + // Advance Powers (including new) + LevelUpPowers() + //////// + // Advance Stats + if(ishuman(owner.current)) + var/mob/living/carbon/human/H = owner.current + var/datum/species/S = H.dna.species + S.burnmod *= 0.025 // Slightly more burn damage + S.stunmod *= 0.95 // Slightly less stun time. + S.punchdamagelow += 0.5 + S.punchdamagehigh += 0.5 // NOTE: This affects the hitting power of Brawn. + // More Health + owner.current.setMaxHealth(owner.current.maxHealth + 5) + // Vamp Stats + regenRate += 0.05 // Points of brute healed (starts at 0.3) + feedAmount += 2 // Increase how quickly I munch down vics (15) + maxBloodVolume += 50 // Increase my max blood (600) + ///////// + vamplevel ++ + vamplevel_unspent -- + + // Assign True Reputation + if(vamplevel == 4) + SelectReputation(am_fledgling = FALSE, forced = TRUE) + to_chat(owner.current, "You are now a rank [vamplevel] Bloodsucker. Your strength, resistence, health, feed rate, regen rate, and maximum blood have all increased!") + to_chat(owner.current, "Your existing powers have all ranked up as well!") + update_hud(TRUE) + owner.current.playsound_local(null, 'sound/effects/pope_entry.ogg', 25, 1) // Play THIS sound for user only. The "null" is where turf would go if a location was needed. Null puts it right in their head. + +//////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////// + +//This handles the application of antag huds/special abilities +/datum/antagonist/bloodsucker/apply_innate_effects(mob/living/mob_override) + return + +//This handles the removal of antag huds/special abilities +/datum/antagonist/bloodsucker/remove_innate_effects(mob/living/mob_override) + return + +//Assign default team and creates one for one of a kind team antagonists +/datum/antagonist/bloodsucker/create_team(datum/team/team) + return + +// Create Objectives +/datum/antagonist/bloodsucker/proc/forge_bloodsucker_objectives() // Fledgling vampires can have different objectives. + + // TEAM + //clan = new /datum/team/vampireclan(owner) + + + // Lair Objective: Create a Lair + var/datum/objective/bloodsucker/lair/lair_objective = new + lair_objective.owner = owner + lair_objective.generate_objective() + add_objective(lair_objective) + + // Protege Objective + var/datum/objective/bloodsucker/protege/protege_objective = new + protege_objective.owner = owner + protege_objective.generate_objective() + add_objective(protege_objective) + + if (rand(0,1) == 0) + // Heart Thief Objective + var/datum/objective/bloodsucker/heartthief/heartthief_objective = new + heartthief_objective.owner = owner + heartthief_objective.generate_objective() + add_objective(heartthief_objective) + + else + // Solars Objective + var/datum/objective/bloodsucker/solars/solars_objective = new + solars_objective.owner = owner + solars_objective.generate_objective() + add_objective(solars_objective) + + // Survive Objective + var/datum/objective/bloodsucker/survive/survive_objective = new + survive_objective.owner = owner + survive_objective.generate_objective() + add_objective(survive_objective) + + +/datum/antagonist/bloodsucker/proc/add_objective(var/datum/objective/O) + objectives += O + objectives_given += O + +/datum/antagonist/bloodsucker/proc/clear_bloodsucker_objectives() + + var/datum/team/team = get_team() + if(team) + team.remove_member(owner) + + for(var/O in objectives_given) + objectives -= O + qdel(O) + objectives_given = list() // Traitors had this, so I added it. Not sure why. + + +/datum/antagonist/bloodsucker/get_team() + return clan + +//Name shown on antag list +/datum/antagonist/bloodsucker/antag_listing_name() + return ..() + "([ReturnFullName(TRUE)])" + +//Whatever interesting things happened to the antag admins should know about +//Include additional information about antag in this part +/datum/antagonist/bloodsucker/antag_listing_status() + if (owner && owner.AmFinalDeath()) + return "Final Death" + return ..() + + + +//Individual roundend report +/datum/antagonist/bloodsucker/roundend_report() + // Get the default Objectives + var/list/report = list() + + // Vamp Name + report += "
\[[ReturnFullName(TRUE)]\]" + + // Default Report + report += ..() + + // Now list their vassals + if (vassals.len > 0) + report += "Their Vassals were..." + for (var/datum/antagonist/vassal/V in vassals) + if (V.owner) + var/jobname = V.owner.assigned_role ? "the [V.owner.assigned_role]" : "" + report += "[V.owner.name] [jobname]" + + return report.Join("
") + +//Displayed at the start of roundend_category section, default to roundend_category header +/datum/antagonist/bloodsucker/roundend_report_header() + return "Lurking in the darkness, the Bloodsuckers were:
" + + + + + +// 2019 Breakdown of Bloodsuckers: + +// G A M E P L A Y +// +// Bloodsuckers should be inherrently powerful: they never stay dead, and they can hide in plain sight +// better than any other antagonist aboard the station. +// +// However, only elder Bloodsuckers are the powerful creatures of legend. Ranking up as a Bloodsucker +// should impart slight strength and health benefits, as well as powers that can grow over time. But +// their weaknesses should grow as well, and not just to fire. + + +// A B I L I T I E S +// +// * Bloodsuckers can FEIGN LIFE + DEATH. +// Feigning LIFE: +// - Warms up the body +// - Creates a heartbeat +// - Fake blood amount (550) +// Feign DEATH: Not yet done +// - When lying down or sitting, you appear "dead and lifeless" + +// * Bloodsuckers REGENERATE +// - Brute damage heals rather rapidly. Burn damage heals slowly. +// - Healing is reduced when hungry or starved. +// - Burn does not heal when starved. A starved vampire remains "dead" until burns can heal. +// - Bodyparts and organs regrow in Torpor (except for the Heart and Brain). +// +// * Bloodsuckers are IMMORTAL +// - Brute damage cannot destroy them (and it caps very low, so they don't stack too much) +// - Burn damage can only kill them at very high amounts. +// - Removing the head kills the vamp forever. +// - Removing the heart kills the vamp until replaced. +// +// * Bloodsuckers are DEAD +// - They do not breathe. +// - Cold affects them less. +// - They are immune to disease (but can spread it) +// - Food is useless and cause sickness. +// - Nothing can heal the vamp other than his own blood. +// +// * Bloodsuckers are PREDATORS +// - They detect life/heartbeats nearby. +// - They know other predators instantly (Vamps, Werewolves, and alien types) regardless of disguise. +// +// +// +// * Bloodsuckers enter Torpor when DEAD or RESTING in coffin +// - Torpid vampires regenerate their health. Coffins negate cost and speed up the process. +// ** To rest in a coffin, either SLEEP or CLOSE THE LID while you're in it. You will be given a prompt to sleep until healed. Healing in a coffin costs NO blood! +// + + + +// O B J E C T I V E S +// +// +// +// +// 1) GROOM AN HEIR: Find a person with appropriate traits (hair, blood type, gender) to be turned as a Vampire. Before they rise, they must be properly trained. Raise them to great power after their change. +// +// 2) BIBLIOPHILE: Research objects of interest, study items looking for clues of ancient secrets, and hunt down the clues to a Vampiric artifact of horrible power. +// +// 3) CRYPT LORD: Build a terrifying sepulcher to your evil, with servants to lavish upon you in undeath. The trappings of a true crypt lord come at grave cost. +// +// 4) GOURMOND: Oh, to taste all the delicacies the station has to offer! DRINK ## BLOOD FROM VICTIMS WHO LIVE, EAT ## ORGANS FROM VICTIMS WHO LIVE + + +// Vassals +// +// - Loyal to (and In Love With) Master +// - Master can speak to, summon, or punish his Vassals, even while asleep or torpid. +// - Master may have as many Vassals as Rank +// - Vassals see their Master's speech emboldened! + + + + + + + + +// Dev Notes +// +// HEALING: Maybe Vamps metabolize specially? Like, they slowly drip their own blood into their system? +// - Give Vamps their own metabolization proc, perhaps? +// ** shadowpeople.dm has rules for healing. +// +// KILLING: It's almost impossible to track who someone has directly killed. But an Admin could be given +// an easy way to whip a Bloodsucker for cruel behavior, as a RP mechanic but not a punishment. +// ** +// +// HUNGER: Just keep adjusting mob's nutrition to Blood Hunger level. No need to cancel nutrition from eating. +// ** mob.dm /set_nutrition() +// ** snacks.dm / attack() <-- Stop food from doing anything? + +// ORGANS: Liver +// ** life.dm /handle_liver() +// +// CORPSE: Most of these effects likely go away when using "Masquerade" to appear alive. +// ** status_procs.dm /adjust_bodytemperature() +// ** traits.dm /TRAIT_NOBREATH /TRAIT_SLEEPIMMUNE /TRAIT_RESISTCOLD /TRAIT_RADIMMUNE /TRAIT_VIRUSIMMUNE +// * MASQUERADE ON/OFF: /TRAIT_FAKEDEATH (M) +// * /TRAIT_NIGHT_VISION +// * /TRAIT_DEATHCOMA <-- This basically makes you immobile. When using status_procs /fakedeath(), make sure to remove Coma unless we're in Torpor! +// * /TRAIT_NODEATH <--- ??? +// ** species /NOZOMBIE +// * ADD: TRAIT_COLDBLOODED <-- add to carbon/life.dm /natural_bodytemperature_stabilization() +// +// MASQUERADE Appear as human! +// ** examine.dm /examine() <-- Change "blood_volume < BLOOD_VOLUME_SAFE" to a new examine +// +// NOSFERATU ** human.add_trait(TRAIT_DISFIGURED, "insert_vamp_datum_here") <-- Makes you UNKNOWN unless your ID says otherwise. +// STEALTH ** human_helpers.dm /get_visible_name() ** shadowpeople.dm has rules for Light. +// +// FRENZY ** living.dm /update_mobility() (USED TO be update_canmove) +// +// PREDATOR See other Vamps! +// * examine.dm /examine() +// +// WEAKNESSES: -Poor mood in Chapel or near Chaplain. -Stamina damage from Bible + + + + //message_admins("DEBUG3: attempt_cast() [name] / [user_C.handcuffed] ") + + +// TODO: +// +// Death (fire, heart, brain, head) +// Disable Life: BLOOD +// Body Temp +// Spend blood over time (more if imitating life) (none if sleeping in coffin) +// Auto-Heal (brute to 0, fire to 99) (toxin/o2 always 0) +// +// Hud Icons +// UI Blood Counter +// Examine Name (+Masquerade, only "Dead and lifeless" if not standing?) +// +// +// Turn vamps +// Create vassals +// + + +// FIX LIST +// + + +///////////////////////////////////// + + // HUD! // + +/datum/antagonist/bloodsucker/proc/update_bloodsucker_icons_added(datum/mind/m) + var/datum/atom_hud/antag/vamphud = GLOB.huds[ANTAG_HUD_BLOODSUCKER] + vamphud.join_hud(owner.current) + set_antag_hud(owner.current, "bloodsucker") // "bloodsucker" + owner.current.hud_list[ANTAG_HUD].icon = image('icons/mob/hud.dmi', owner.current, "bloodsucker") //Check prepare_huds in mob.dm to see why. + +/datum/antagonist/bloodsucker/proc/update_bloodsucker_icons_removed(datum/mind/m) + var/datum/atom_hud/antag/vamphud = GLOB.huds[ANTAG_HUD_BLOODSUCKER] + vamphud.leave_hud(owner.current) + set_antag_hud(owner.current, null) + +/datum/atom_hud/antag/bloodsucker // from hud.dm in /datums/ Also see data_huds.dm + antag_hud.dm + +/datum/atom_hud/antag/bloodsucker/add_to_single_hud(mob/M, atom/A) + if (!check_valid_hud_user(M,A)) // FULP: This checks if the Mob is a Vassal, and if the Atom is his master OR on his team. + return + ..() + +/datum/atom_hud/antag/bloodsucker/proc/check_valid_hud_user(mob/M, atom/A) // Remember: A is being added to M's hud. Because M's hud is a /antag/vassal hud, this means M is the vassal here. + // Ghost Admins always see Bloodsuckers/Vassals + if (isobserver(M)) + return TRUE + // GOAL: Vassals see their Master and his other Vassals. + // GOAL: Vassals can BE seen by their Bloodsucker and his other Vassals. + // GOAL: Bloodsuckers can see each other. + if (!M || !A || !ismob(A) || !M.mind)// || !A.mind) + return FALSE + var/mob/A_mob = A + if (!A_mob.mind) + return FALSE + // Find Datums: Bloodsucker + var/datum/antagonist/bloodsucker/atom_B = A_mob.mind.has_antag_datum(ANTAG_DATUM_BLOODSUCKER) + var/datum/antagonist/bloodsucker/mob_B = M.mind.has_antag_datum(ANTAG_DATUM_BLOODSUCKER) + // Check 1) Are we both Bloodsuckers? + if (atom_B && mob_B) + return TRUE + // Find Datums: Vassal + var/datum/antagonist/vassal/atom_V = A_mob.mind.has_antag_datum(ANTAG_DATUM_VASSAL) + var/datum/antagonist/vassal/mob_V = M.mind.has_antag_datum(ANTAG_DATUM_VASSAL) + // Check 2) If they are a BLOODSUCKER, then are they my Master? + if (mob_V && atom_B == mob_V.master) + return TRUE // SUCCESS! + // Check 3) If I am a BLOODSUCKER, then are they my Vassal? + if (mob_B && atom_V && (atom_V in mob_B.vassals)) + return TRUE // SUCCESS! + // Check 4) If we are both VASSAL, then do we have the same master? + if (atom_V && mob_V && atom_V.master == mob_V.master) + return TRUE // SUCCESS! + return FALSE + + + + ///////////////////////////////////// + + + // BLOOD COUNTER & RANK MARKER ! // + +#define ui_sunlight_display "WEST:6,CENTER-0:0" // 6 pixels to the right, zero tiles & 5 pixels DOWN. +#define ui_blood_display "WEST:6,CENTER-1:0" // 1 tile down +#define ui_vamprank_display "WEST:6,CENTER-2:-5" // 2 tiles down + +/datum/hud + var/obj/screen/bloodsucker/blood_counter/blood_display + var/obj/screen/bloodsucker/rank_counter/vamprank_display + var/obj/screen/bloodsucker/sunlight_counter/sunlight_display + +/datum/antagonist/bloodsucker/proc/add_hud() + return + +/datum/antagonist/bloodsucker/proc/remove_hud() + // No Hud? Get out. + if (!owner.current.hud_used) + return + owner.current.hud_used.blood_display.invisibility = INVISIBILITY_ABSTRACT + owner.current.hud_used.vamprank_display.invisibility = INVISIBILITY_ABSTRACT + owner.current.hud_used.sunlight_display.invisibility = INVISIBILITY_ABSTRACT + +/datum/antagonist/bloodsucker/proc/update_hud(updateRank=FALSE) + // No Hud? Get out. + if(!owner.current.hud_used) + return + // Update Blood Counter + if (owner.current.hud_used.blood_display) + var/valuecolor = "#FF6666" + if(owner.current.blood_volume > BLOOD_VOLUME_SAFE) + valuecolor = "#FFDDDD" + else if(owner.current.blood_volume > BLOOD_VOLUME_BAD) + valuecolor = "#FFAAAA" + owner.current.hud_used.blood_display.update_counter(owner.current.blood_volume, valuecolor) + + // Update Rank Counter + if(owner.current.hud_used.vamprank_display) + var/valuecolor = vamplevel_unspent ? "#FFFF00" : "#FF0000" + owner.current.hud_used.vamprank_display.update_counter(vamplevel, valuecolor) + if(updateRank) // Only change icon on special request. + owner.current.hud_used.vamprank_display.icon_state = (vamplevel_unspent > 0) ? "rank_up" : "rank" + + +/obj/screen/bloodsucker + invisibility = INVISIBILITY_ABSTRACT + +/obj/screen/bloodsucker/proc/clear() + invisibility = INVISIBILITY_ABSTRACT + +/obj/screen/bloodsucker/proc/update_counter(value, valuecolor) + invisibility = 0 // Make Visible + +/obj/screen/bloodsucker/blood_counter // NOTE: Look up /obj/screen/devil/soul_counter in _onclick / hud / human.dm + icon = 'icons/mob/actions/bloodsucker.dmi'//'icons/mob/screen_gen.dmi' + name = "Blood Consumed" + icon_state = "blood_display"//"power_display" + screen_loc = ui_blood_display + +/obj/screen/bloodsucker/blood_counter/update_counter(value, valuecolor) + ..() + maptext = "
[round(value,1)]
"
+
+/obj/screen/bloodsucker/rank_counter
+ name = "Bloodsucker Rank"
+ icon = 'icons/mob/actions/bloodsucker.dmi'
+ icon_state = "rank"
+ screen_loc = ui_vamprank_display
+
+/obj/screen/bloodsucker/rank_counter/update_counter(value, valuecolor)
+ ..()
+ maptext = "[round(value,1)]
"
+
+/obj/screen/bloodsucker/sunlight_counter
+ icon = 'icons/mob/actions/bloodsucker.dmi'
+ name = "Solar Flare Timer"
+ icon_state = "sunlight_night"
+ screen_loc = ui_sunlight_display
+
+/datum/antagonist/bloodsucker/proc/update_sunlight(value, amDay = FALSE)
+ // No Hud? Get out.
+ if (!owner.current.hud_used)
+ return
+ // Update Sun Time
+ if (owner.current.hud_used.sunlight_display)
+ var/valuecolor = "#BBBBFF"
+ if (amDay)
+ valuecolor = "#FF5555"
+ else if(value <= 25)
+ valuecolor = "#FFCCCC"
+ else if(value < 10)
+ valuecolor = "#FF5555"
+ var/value_string = (value >= 60) ? "[round(value / 60, 1)] m" : "[round(value,1)] s"
+ owner.current.hud_used.sunlight_display.update_counter( value_string, valuecolor )
+ owner.current.hud_used.sunlight_display.icon_state = "sunlight_" + (amDay ? "day":"night")
+
+
+/obj/screen/bloodsucker/sunlight_counter/update_counter(value, valuecolor)
+ ..()
+ maptext = "[value]
"
diff --git a/code/modules/antagonists/bloodsucker/datum_hunter.dm b/code/modules/antagonists/bloodsucker/datum_hunter.dm
new file mode 100644
index 0000000000..2d680d0e09
--- /dev/null
+++ b/code/modules/antagonists/bloodsucker/datum_hunter.dm
@@ -0,0 +1,295 @@
+/*
+#define HUNTER_SCAN_MIN_DISTANCE 8
+#define HUNTER_SCAN_MAX_DISTANCE 35
+#define HUNTER_SCAN_PING_TIME 20 //5s update time.
+
+
+/datum/antagonist/vamphunter
+ name = "Hunter"
+ roundend_category = "hunters"
+ antagpanel_category = "Monster Hunter"
+ job_rank = ROLE_MONSTERHUNTER
+ var/list/datum/action/powers = list()// Purchased powers
+ var/list/datum/objective/objectives_given = list() // For removal if needed.
+ var/datum/martial_art/my_kungfu // Hunters know a lil kung fu.
+ var/bad_dude = FALSE // Every first hunter spawned is a SHIT LORD.
+
+
+/datum/antagonist/vamphunter/on_gain()
+
+ SSticker.mode.vamphunters |= owner // Add if not already in here (and you might be, if you were picked at round start)
+
+ // Hunter Pinpointer
+ //owner.current.apply_status_effect(/datum/status_effect/agent_pinpointer/hunter_edition)
+
+ // Give Hunter Power
+ var/datum/action/P = new /datum/action/bloodsucker/trackvamp
+ P.Grant(owner.current)
+
+ // Give Hunter Martial Arts
+ //if (rand(1,3) == 1)
+ // var/datum/martial_art/pick_type = pick (/datum/martial_art/cqc, /datum/martial_art/krav_maga, /datum/martial_art/cqc, /datum/martial_art/krav_maga, /datum/martial_art/wrestling) // /datum/martial_art/boxing <--- doesn't include grabbing, so don't use!
+ // my_kungfu = new pick_type //pick (/datum/martial_art/boxing, /datum/martial_art/cqc) // ick_type
+ // my_kungfu.teach(owner.current, 0)
+
+ // Give Hunter Objective
+ var/datum/objective/bloodsucker/monsterhunter/monsterhunter_objective = new
+ monsterhunter_objective.owner = owner
+ monsterhunter_objective.generate_objective()
+ objectives += monsterhunter_objective
+ objectives_given += monsterhunter_objective
+ // Badguy Hunter? (Give him BADGUY objectives)
+ if (bad_dude)
+ // Stolen DIRECTLY from datum_traitor.dm
+ if(prob(15) && !(locate(/datum/objective/download) in objectives) && !(owner.assigned_role in list("Research Director", "Scientist", "Roboticist")))
+ var/datum/objective/download/download_objective = new
+ download_objective.owner = owner
+ download_objective.gen_amount_goal()
+ objectives += download_objective
+ objectives_given += download_objective
+ else
+ var/datum/objective/steal/steal_objective = new
+ steal_objective.owner = owner
+ steal_objective.find_target()
+ objectives += steal_objective
+ objectives_given += steal_objective
+
+
+ . = ..()
+
+/datum/antagonist/vamphunter/on_removal()
+
+ SSticker.mode.vamphunters -= owner // Add if not already in here (and you might be, if you were picked at round start)
+
+ // Master Pinpointer
+ //owner.current.remove_status_effect(/datum/status_effect/agent_pinpointer/hunter_edition)
+
+ // Take Hunter Power
+ if (owner.current)
+ for (var/datum/action/bloodsucker/P in owner.current.actions)
+ P.Remove(owner.current)
+
+ // Take Hunter Martial Arts
+ //my_kungfu.remove(owner.current)
+
+ // Remove Hunter Objectives
+ for(var/O in objectives_given)
+ objectives -= O
+ qdel(O)
+ objectives_given = list()
+
+ . = ..()
+
+/datum/antagonist/vamphunter/greet()
+ var/vamp_hunter_greet = "You are a fearless Monster Hunter!"
+ vamp_hunter_greet += "You know there's one or more filthy creature onboard the station, though their identities elude you."
+ vamp_hunter_greet += "It's your job to root them out, destroy their nests, and save the crew."
+ vamp_hunter_greet += "Use WHATEVER MEANS NECESSARY to find these creatures...no matter who gets hurt or what you have to destroy to do it."
+ vamp_hunter_greet += "There are greater stakes at hand than the safety of the station!"
+ vamp_hunter_greet += "However, security may detain you if they discover your mission..."
+ antag_memory += "You remember your training:" + antag_memory += " -Bloodsuckers are weak to fire, or a stake to the heart. Removing their head or heart will also destroy them permanently.
" + antag_memory += " -Wooden stakes can be made from planks, and hardened by a welding tool. Your recipes list has ways of making them even stronger.
" + antag_memory += " -Changelings return to life unless their body is destroyed. Not even decapitation can stop them for long.
" + antag_memory += " -Cultists are weak to the Chaplain's holy water.
" + antag_memory += " -Wizards are notoriously hard to outmatch. Rob or steal whatever weapons you need to destroy them, and shoot before asking questions.
" + if (my_kungfu != null) + vamp_hunter_greet += "Hunter Tip: Use your [my_kungfu.name] techniques to give you an advantage over the enemy.
" + antag_memory += "You remember your training: You are skilled in the [my_kungfu.name] style of combat.
" + to_chat(owner, vamp_hunter_greet) + +/datum/antagonist/vamphunter/farewell() + to_chat(owner, "Your hunt has ended: you are no longer a monster hunter!") + + +// TAKEN FROM: /datum/action/changeling/pheromone_receptors // pheromone_receptors.dm for a version of tracking that Changelings have! + + +/datum/status_effect/agent_pinpointer/hunter_edition + alert_type = /obj/screen/alert/status_effect/agent_pinpointer/hunter_edition + minimum_range = HUNTER_SCAN_MIN_DISTANCE + tick_interval = HUNTER_SCAN_PING_TIME + duration = 160 // Lasts 10s + range_fuzz_factor = 5//PINPOINTER_EXTRA_RANDOM_RANGE + +/obj/screen/alert/status_effect/agent_pinpointer/hunter_edition + name = "Monster Tracking" + desc = "You always know where the hellspawn are." + + +/datum/status_effect/agent_pinpointer/hunter_edition/on_creation(mob/living/new_owner, ...) + ..() + + // Pick target + var/turf/my_loc = get_turf(owner) + var/list/mob/living/carbon/vamps = list() + + for(var/datum/mind/M in SSticker.mode.bloodsuckers) + if (!M.current || M.current == owner || !get_turf(M.current) || !get_turf(new_owner)) + continue + var/datum/antagonist/bloodsucker/antag_datum = M.has_antag_datum(ANTAG_DATUM_BLOODSUCKER) + if(!istype(antag_datum)) + continue + var/their_loc = get_turf(M.current) + var/distance = get_dist_euclidian(my_loc, their_loc) + if (distance < HUNTER_SCAN_MAX_DISTANCE) + vamps[M.current] = (HUNTER_SCAN_MAX_DISTANCE ** 2) - (distance ** 2) + // Found one! + if(vamps.len) + scan_target = pickweight(vamps) //Point at a 'random' vamp, biasing heavily towards closer ones. + to_chat(owner, "You detect signs of monsters to the [dir2text(get_dir(my_loc,get_turf(scan_target)))]!") + // Will yield a "?" + else + to_chat(owner, "There are no monsters nearby.") + // Force Point-To Immediately + point_to_target() + +/datum/status_effect/agent_pinpointer/hunter_edition/scan_for_target() + // Lose target? Done. Otherwise, scan for target's current position. + if (!scan_target && owner) + owner.remove_status_effect(/datum/status_effect/agent_pinpointer/hunter_edition) + + // NOTE: Do NOT run ..(), or else we'll remove our target. + + +/datum/status_effect/agent_pinpointer/hunter_edition/Destroy() + if (scan_target) + to_chat(owner, "You've lost the trail.") + ..() +*/ + +//////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////// +//////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////// +/* + + +/datum/action/bloodsucker/trackvamp/ + name = "Track Monster"//"Cellular Emporium" + desc = "Take a moment to look for clues of any nearby monsters.
These creatures are slippery, and often look like the crew." + button_icon = 'icons/mob/actions/bloodsucker.dmi' //This is the file for the BACKGROUND icon + background_icon_state = "vamp_power_off" //And this is the state for the background icon + icon_icon = 'icons/mob/actions/bloodsucker.dmi' //This is the file for the ACTION icon + button_icon_state = "power_hunter" //And this is the state for the action icon + amToggle = FALSE // Action-Related + cooldown = 300 // 10 ticks, 1 second. + bloodcost = 0 + +/datum/action/bloodsucker/trackvamp/ActivatePower() + + var/mob/living/user = owner + to_chat(user, "You look around, scanning your environment and discerning signs of any filthy, wretched affronts to the natural order.") + + if (!do_mob(user,owner,80)) + return + // Add Power + // REMOVED //user.apply_status_effect(/datum/status_effect/agent_pinpointer/hunter_edition) + // We don't track direction anymore! + // Return text indicating direction + display_proximity() + // NOTE: DON'T DEACTIVATE! + //DeactivatePower() + +/datum/action/bloodsucker/trackvamp/proc/display_proximity() + // Pick target + var/turf/my_loc = get_turf(owner) + //var/list/mob/living/carbon/vamps = list() + var/best_dist = 9999 + var/mob/living/best_vamp + + // Track ALL MONSTERS in Game Mode + var/list/datum/mind/monsters = list() + monsters += SSticker.mode.bloodsuckers + monsters += SSticker.mode.devils + //monsters += SSticker.mode.cult + monsters += SSticker.mode.wizards + monsters += SSticker.mode.apprentices + monsters += SSticker.mode.servants_of_ratvar + //monsters += SSticker.mode.changelings Disabled anyways + // + for(var/datum/mind/M in monsters) + if (!M.current || M.current == owner)// || !get_turf(M.current) || !get_turf(owner)) + continue + for(var/a in M.antag_datums) + var/datum/antagonist/antag_datum = a // var/datum/antagonist/antag_datum = M.has_antag_datum(ANTAG_DATUM_BLOODSUCKER) + if(!istype(antag_datum) || antag_datum.AmFinalDeath()) + continue + var/their_loc = get_turf(M.current) + var/distance = get_dist_euclidian(my_loc, their_loc) + // Found One: Closer than previous/max distance + if (distance < best_dist && distance <= HUNTER_SCAN_MAX_DISTANCE) + best_dist = distance + best_vamp = M.current + break // Stop searching through my antag datums and go to the next guy + + // Found one! + if(best_vamp) + var/distString = best_dist <= HUNTER_SCAN_MAX_DISTANCE / 2 ? "somewhere closeby!" : "somewhere in the distance." + //to_chat(owner, "You detect signs of Bloodsuckers to the [dir2text(get_dir(my_loc,get_turf(targetVamp)))]!") + to_chat(owner, "You detect signs of monsters [distString]") + + // Will yield a "?" + else + to_chat(owner, "There are no monsters nearby.") + + + + + + + + + + + + + +//////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////// +//////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////// + +// From martial.dm + +/* +/datum/martial_art/hunter + name = "Hunter-Fu" + id = "MARTIALART_HUNTER" //ID, used by mind/has_martialart + //streak = "" + //max_streak_length = 6 + //current_target + //datum/martial_art/base // The permanent style. This will be null unless the martial art is temporary + //deflection_chance = 0 //Chance to deflect projectiles + //reroute_deflection = FALSE //Delete the bullet, or actually deflect it in some direction? + //block_chance = 0 //Chance to block melee attacks using items while on throw mode. + //restraining = 0 //used in cqc's disarm_act to check if the disarmed is being restrained and so whether they should be put in a chokehold or not + //help_verb + //no_guns = FALSE + //allow_temp_override = TRUE //if this martial art can be overridden by temporary martial arts + +/datum/martial_art/hunter/disarm_act(mob/living/carbon/human/A, mob/living/carbon/human/D) + return FALSE + +/datum/martial_art/hunter/harm_act(mob/living/carbon/human/A, mob/living/carbon/human/D) + return FALSE + +/datum/martial_art/hunter/grab_act(mob/living/carbon/human/A, mob/living/carbon/human/D) + return FALSE + +/datum/martial_art/hunter/can_use(mob/living/carbon/human/H) + return TRUE + + +/datum/martial_art/hunter/add_to_streak(element,mob/living/carbon/human/D) + if(D != current_target) + current_target = D + streak = "" + restraining = 0 + streak = streak+element + if(length(streak) > max_streak_length) + streak = copytext(streak,2) + return + + +/datum/martial_art/hunter/basic_hit(mob/living/carbon/human/A,mob/living/carbon/human/D) + + var/damage = rand(A.dna.species.punchdamagelow, A.dna.species.punchdamagehigh) +*/ +*/ diff --git a/code/modules/antagonists/bloodsucker/datum_vassal.dm b/code/modules/antagonists/bloodsucker/datum_vassal.dm new file mode 100644 index 0000000000..71ee0bcc1d --- /dev/null +++ b/code/modules/antagonists/bloodsucker/datum_vassal.dm @@ -0,0 +1,151 @@ +#define VASSAL_SCAN_MIN_DISTANCE 5 +#define VASSAL_SCAN_MAX_DISTANCE 500 +#define VASSAL_SCAN_PING_TIME 20 //2s update time. + + +/datum/antagonist/bloodsucker/proc/attempt_turn_vassal(mob/living/carbon/C) + C.silent = 0 + return SSticker.mode.make_vassal(C,owner) + +/datum/antagonist/bloodsucker/proc/FreeAllVassals() + for (var/datum/antagonist/vassal/V in vassals) + SSticker.mode.remove_vassal(V.owner) + +/datum/antagonist/vassal + name = "Vassal"//WARNING: DO NOT SELECT" // "Vassal" + roundend_category = "vassals" + antagpanel_category = "Bloodsucker" + job_rank = ROLE_BLOODSUCKER + var/datum/antagonist/bloodsucker/master // Who made me? + var/list/datum/action/powers = list()// Purchased powers + var/list/datum/objective/objectives_given = list() // For removal if needed. + +/datum/antagonist/vassal/can_be_owned(datum/mind/new_owner) + // If we weren't created by a bloodsucker, then we cannot be a vassal (assigned from antag panel) + if (!master) + return FALSE + return ..() + +/datum/antagonist/vassal/on_gain() + SSticker.mode.vassals |= owner // Add if not already in here (and you might be, if you were picked at round start) + // Mindslave Add + if(master) + var/datum/antagonist/bloodsucker/B = master.owner.has_antag_datum(ANTAG_DATUM_BLOODSUCKER) + if(B) + B.vassals |= src + owner.enslave_mind_to_creator(master.owner.current) + // Master Pinpointer + owner.current.apply_status_effect(/datum/status_effect/agent_pinpointer/vassal_edition) + // Powers + var/datum/action/bloodsucker/vassal/recuperate/new_Recuperate = new () + new_Recuperate.Grant(owner.current) + powers += new_Recuperate + // Give Vassal Objective + var/datum/objective/bloodsucker/vassal/vassal_objective = new + vassal_objective.owner = owner + vassal_objective.generate_objective() + objectives += vassal_objective + objectives_given += vassal_objective + give_thrall_eyes() + owner.current.grant_language(/datum/language/vampiric) + // Add Antag HUD + update_vassal_icons_added(owner.current, "vassal") + . = ..() + +/datum/antagonist/vassal/proc/give_thrall_eyes() + var/obj/item/organ/eyes/vassal/E = new + E.Insert(owner.current) + +/obj/item/organ/eyes/vassal/ + lighting_alpha = 180 // LIGHTING_PLANE_ALPHA_MOSTLY_INVISIBLE <--- This is too low a value at 128. We need to SEE what the darkness is so we can hide in it. + see_in_dark = 12 + flash_protect = -1 //These eyes are weaker to flashes, but let you see in the dark + +/datum/antagonist/vassal/proc/remove_thrall_eyes() + var/obj/item/organ/eyes/E = new + E.Insert(owner.current) + +/datum/antagonist/vassal/on_removal() + SSticker.mode.vassals -= owner // Add if not already in here (and you might be, if you were picked at round start) + // Mindslave Remove + if (master && master.owner) + master.vassals -= src + if (owner.enslaved_to == master.owner.current) + owner.enslaved_to = null + // Master Pinpointer + owner.current.remove_status_effect(/datum/status_effect/agent_pinpointer/vassal_edition) + // Powers + while(powers.len) + var/datum/action/power = pick(powers) + powers -= power + power.Remove(owner.current) + // Remove Hunter Objectives + for(var/O in objectives_given) + objectives -= O + qdel(O) + objectives_given = list() + remove_thrall_eyes() + owner.current.remove_language(/datum/language/vampiric) + // Clear Antag HUD + update_vassal_icons_removed(owner.current) + + . = ..() + +/datum/antagonist/vassal/greet() + to_chat(owner, "You are now the mortal servant of [master.owner.current], a bloodsucking vampire!") + to_chat(owner, "The power of [master.owner.current.p_their()] immortal blood compells you to obey [master.owner.current.p_them()] in all things, even offering your own life to prolong theirs.
\ + You are not required to obey any other Bloodsucker, for only [master.owner.current] is your master. The laws of Nanotransen do not apply to you now; only your vampiric master's word must be obeyed.") + // Effects... + owner.current.playsound_local(null, 'sound/magic/mutate.ogg', 100, FALSE, pressure_affected = FALSE) + //owner.store_memory("You became the mortal servant of [master.owner.current], a bloodsucking vampire!") + antag_memory += "You became the mortal servant of [master.owner.current], a bloodsucking vampire!
" + // And to your new Master... + to_chat(master.owner, "[owner.current] has become addicted to your immortal blood. [owner.current.p_they(TRUE)] [owner.current.p_are()] now your undying servant!") + master.owner.current.playsound_local(null, 'sound/magic/mutate.ogg', 100, FALSE, pressure_affected = FALSE) + +/datum/antagonist/vassal/farewell() + owner.current.visible_message("[owner.current]'s eyes dart feverishly from side to side, and then stop. [owner.current.p_they(TRUE)] seem[owner.current.p_s()] calm, \ + like [owner.current.p_they()] [owner.current.p_have()] regained some lost part of [owner.current.p_them()]self.",\ + "With a snap, you are no longer enslaved to [master.owner]! You breathe in heavily, having regained your free will.") + owner.current.playsound_local(null, 'sound/magic/mutate.ogg', 100, FALSE, pressure_affected = FALSE) + // And to your former Master... + //if (master && master.owner) + // to_chat(master.owner, "You feel the bond with your vassal [owner.current] has somehow been broken!") + +/datum/status_effect/agent_pinpointer/vassal_edition + id = "agent_pinpointer" + alert_type = /obj/screen/alert/status_effect/agent_pinpointer/vassal_edition + minimum_range = VASSAL_SCAN_MIN_DISTANCE + tick_interval = VASSAL_SCAN_PING_TIME + duration = -1 // runs out fast + range_fuzz_factor = 0 + +/obj/screen/alert/status_effect/agent_pinpointer/vassal_edition + name = "Blood Bond" + desc = "You always know where your master is." + //icon = 'icons/obj/device.dmi' + //icon_state = "pinon" + +/datum/status_effect/agent_pinpointer/vassal_edition/on_creation(mob/living/new_owner, ...) + ..() + + var/datum/antagonist/vassal/antag_datum = new_owner.mind.has_antag_datum(ANTAG_DATUM_VASSAL) + scan_target = antag_datum?.master?.owner?.current + +/datum/status_effect/agent_pinpointer/vassal_edition/scan_for_target() + // DO NOTHING. We already have our target, and don't wanna do anything from agent_pinpointer + +/datum/antagonist/vassal/proc/update_vassal_icons_added(mob/living/vassal, icontype="vassal") + var/datum/atom_hud/antag/bloodsucker/hud = GLOB.huds[ANTAG_HUD_BLOODSUCKER] + hud.join_hud(vassal) + set_antag_hud(vassal, icontype) // Located in icons/mob/hud.dmi + owner.current.hud_list[ANTAG_HUD].icon = image('icons/mob/hud.dmi', owner.current, "bloodsucker") + +/datum/antagonist/vassal/proc/update_vassal_icons_removed(mob/living/vassal) + var/datum/atom_hud/antag/hud = GLOB.huds[ANTAG_HUD_BLOODSUCKER] + hud.leave_hud(vassal) + set_antag_hud(vassal, null) + +//Displayed at the start of roundend_category section, default to roundend_category header +/*/datum/antagonist/vassal/roundend_report_header() + return "Loyal to their bloodsucking masters, the Vassals were:
"*/ diff --git a/code/modules/antagonists/bloodsucker/items/bloodsucker_organs.dm b/code/modules/antagonists/bloodsucker/items/bloodsucker_organs.dm new file mode 100644 index 0000000000..5a905857c5 --- /dev/null +++ b/code/modules/antagonists/bloodsucker/items/bloodsucker_organs.dm @@ -0,0 +1,70 @@ + + +/datum/antagonist/bloodsucker/proc/CheckVampOrgans() + // Do I have any parts that need replacing? + var/obj/item/organ/O + // Heart + O = owner.current.getorganslot(ORGAN_SLOT_HEART) + if(!istype(O, /obj/item/organ/heart/vampheart)) + qdel(O) + var/obj/item/organ/heart/vampheart/H = new + H.Insert(owner.current) + H.Stop() // Now...stop beating! + // Eyes + O = owner.current.getorganslot(ORGAN_SLOT_EYES) + if(!istype(O, /obj/item/organ/eyes/vassal/bloodsucker)) + qdel(O) + var/obj/item/organ/eyes/vassal/bloodsucker/E = new + E.Insert(owner.current) + +/datum/antagonist/bloodsucker/proc/RemoveVampOrgans() + // Heart + var/obj/item/organ/heart/H = new + H.Insert(owner.current) + // Eyes + var/obj/item/organ/eyes/E = new + E.Insert(owner.current) +// HEART: OVERWRITE // +// HEART // +/obj/item/organ/heart/vampheart + beating = 0 + var/fakingit = 0 + +/obj/item/organ/heart/vampheart/prepare_eat() + ..() + // Do cool stuff for eating vamp heart? + +/obj/item/organ/heart/vampheart/Restart() + beating = 0 // DONT run ..(). We don't want to start beating again. + return 0 + +/obj/item/organ/heart/vampheart/Stop() + fakingit = 0 + return ..() + +/obj/item/organ/heart/vampheart/proc/FakeStart() + fakingit = 1 // We're pretending to beat, to fool people. + +/obj/item/organ/heart/vampheart/HeartStrengthMessage() + if(fakingit) + return "a healthy" + return "no" // Bloodsuckers don't have a heartbeat at all when stopped (default is "an unstable") +// EYES // + +/obj/item/organ/eyes/vassal/bloodsucker + flash_protect = 2 //Eye healing isnt working properly + sight_flags = SEE_MOBS // Taken from augmented_eyesight.dm + +/* +// LIVER // +/obj/item/organ/liver/vampliver + // Livers run on_life(), which calls reagents.metabolize() in holder.dm, which calls on_mob_life.dm in the cheam (medicine_reagents.dm) + // Holder also calls reagents.reaction_mob for the moment it happens + +/obj/item/organ/liver/vampliver/on_life() + var/mob/living/carbon/C = owner + + if(!istype(C)) + return + +*/ diff --git a/code/modules/antagonists/bloodsucker/items/bloodsucker_stake.dm b/code/modules/antagonists/bloodsucker/items/bloodsucker_stake.dm new file mode 100644 index 0000000000..9db4cae1ff --- /dev/null +++ b/code/modules/antagonists/bloodsucker/items/bloodsucker_stake.dm @@ -0,0 +1,176 @@ + + +// organ_internal.dm -- /obj/item/organ + + + +// Do I have a stake in my heart? +/mob/living/AmStaked() + var/obj/item/bodypart/BP = get_bodypart("chest") + if (!BP) + return FALSE + for(var/obj/item/I in BP.embedded_objects) + if (istype(I,/obj/item/stake/)) + return TRUE + return FALSE +/mob/proc/AmStaked() + return FALSE + + +/mob/living/proc/StakeCanKillMe() + return IsSleeping() || stat >= UNCONSCIOUS || blood_volume <= 0 || HAS_TRAIT(src, TRAIT_DEATHCOMA) // NOTE: You can't go to sleep in a coffin with a stake in you. + + +///obj/item/weapon/melee/stake +/obj/item/stake/ + name = "wooden stake" + desc = "A simple wooden stake carved to a sharp point." + icon = 'icons/obj/items_and_weapons.dmi' + icon_state = "wood" // Inventory Icon + item_state = "wood" // In-hand Icon + lefthand_file = 'icons/mob/inhands/weapons/melee_lefthand.dmi' // File for in-hand icon + righthand_file = 'icons/mob/inhands/weapons/melee_righthand.dmi' + attack_verb = list("staked") + slot_flags = ITEM_SLOT_BELT + w_class = WEIGHT_CLASS_SMALL + hitsound = 'sound/weapons/bladeslice.ogg' + force = 6 + throwforce = 10 + embedding = list("embed_chance" = 25, "embedded_fall_chance" = 0.5) // UPDATE 2/10/18 embedding_behavior.dm is how this is handled + //embed_chance = 25 // Look up "is_pointed" to see where we set stakes able to do this. + //embedded_fall_chance = 0.5 // Chance it will fall out. + obj_integrity = 30 + max_integrity = 30 + //embedded_fall_pain_multiplier + var/staketime = 120 // Time it takes to embed the stake into someone's chest. + +/obj/item/stake/basic + name = "wooden stake" + // This exists so Hardened/Silver Stake can't have a welding torch used on them. + +/obj/item/stake/basic/attackby(obj/item/W, mob/user, params) + if(istype(W, /obj/item/weldingtool)) + //if (amWelded) + // to_chat(user, "This stake has already been treated with fire.") + // return + //amWelded = TRUE + // Weld it + var/obj/item/weldingtool/WT = W + if(WT.use(0))//remove_fuel(0,user)) + user.visible_message("[user.name] scorched the pointy end of [src] with the welding tool.", \ + "You scorch the pointy end of [src] with the welding tool.", \ + "You hear welding.") + // 8 Second Timer + if(!do_mob(user, src, 80)) + return + // Create the Stake + qdel(src) + var/obj/item/stake/hardened/new_item = new(usr.loc) + user.put_in_hands(new_item) + else + return ..() + +/obj/item/stake/afterattack(atom/target, mob/user, proximity) + //to_chat(world, "DEBUG: Staking ") + // Invalid Target, or not targetting chest with HARM intent? + if(!iscarbon(target) || check_zone(user.zone_selected) != "chest" || user.a_intent != INTENT_HARM) + return + var/mob/living/carbon/C = target + // Needs to be Down/Slipped in some way to Stake. + if(!C.can_be_staked() || target == user) + to_chat(user, "You cant stake [target] when they are moving moving about! They have to be laying down!") + return + // Oops! Can't. + if(HAS_TRAIT(C, TRAIT_PIERCEIMMUNE)) + to_chat(user, "[target]'s chest resists the stake. It won't go in.") + return + // Make Attempt... + to_chat(user, "You put all your weight into embedding the stake into [target]'s chest...") + playsound(user, 'sound/magic/Demon_consume.ogg', 50, 1) + if(!do_mob(user, C, staketime, 0, 1, extra_checks=CALLBACK(C, /mob/living/carbon/proc/can_be_staked))) // user / target / time / uninterruptable / show progress bar / extra checks + return + // Drop & Embed Stake + user.visible_message("[user.name] drives the [src] into [target]'s chest!", \ + "You drive the [src] into [target]'s chest!") + playsound(get_turf(target), 'sound/effects/splat.ogg', 40, 1) + user.dropItemToGround(src, TRUE) //user.drop_item() // "drop item" doesn't seem to exist anymore. New proc is user.dropItemToGround() but it doesn't seem like it's needed now? + var/obj/item/bodypart/B = C.get_bodypart("chest") // This was all taken from hitby() in human_defense.dm + B.embedded_objects |= src + add_mob_blood(target)//Place blood on the stake + loc = C // Put INSIDE the character + B.receive_damage(w_class * embedding.embedded_impact_pain_multiplier) + if(C.mind) + var/datum/antagonist/bloodsucker/bloodsucker = C.mind.has_antag_datum(ANTAG_DATUM_BLOODSUCKER) + if(bloodsucker) + // If DEAD or TORPID...kill vamp! + if(C.StakeCanKillMe()) // NOTE: This is the ONLY time a staked Torpid vamp dies. + bloodsucker.FinalDeath() + return + else + to_chat(target, "You have been staked! Your powers are useless, your death forever, while it remains in place.") + to_chat(user, "You missed [C.p_their(TRUE)]'s heart! It would be easier if [C.p_they(TRUE)] weren't struggling so much.") + +// Can this target be staked? If someone stands up before this is complete, it fails. Best used on someone stationary. +/mob/living/carbon/proc/can_be_staked() + //return resting || IsKnockdown() || IsUnconscious() || (stat && (stat != SOFT_CRIT || pulledby)) || (has_trait(TRAIT_FAKEDEATH)) || resting || IsStun() || IsFrozen() || (pulledby && pulledby.grab_state >= GRAB_NECK) + return (src.resting || src.lying) + // ABOVE: Taken from update_mobility() in living.dm + +/obj/item/stake/hardened + // Created by welding and acid-treating a simple stake. + name = "hardened stake" + desc = "A hardened wooden stake carved to a sharp point and scorched at the end." + icon_state = "hardened" // Inventory Icon + force = 8 + throwforce = 12 + armour_penetration = 10 + embedding = list("embed_chance" = 50, "embedded_fall_chance" = 0) // UPDATE 2/10/18 embedding_behavior.dm is how this is handled + obj_integrity = 120 + max_integrity = 120 + + staketime = 80 + +/obj/item/stake/hardened/silver + name = "silver stake" + desc = "Polished and sharp at the end. For when some mofo is always trying to iceskate uphill." + icon_state = "silver" // Inventory Icon + item_state = "silver" // In-hand Icon + siemens_coefficient = 1 //flags = CONDUCT // var/siemens_coefficient = 1 // for electrical admittance/conductance (electrocution checks and shit) + force = 9 + armour_penetration = 25 + embedding = list("embed_chance" = 65) // UPDATE 2/10/18 embedding_behavior.dm is how this is handled + obj_integrity = 300 + max_integrity = 300 + + staketime = 60 + +// Convert back to Silver +/obj/item/stake/hardened/silver/attackby(obj/item/I, mob/user, params) + if(istype(I, /obj/item/weldingtool)) + var/obj/item/weldingtool/WT = I + if(WT.use(0))//remove_fuel(0, user)) + var/obj/item/stack/sheet/mineral/silver/newsheet = new (user.loc) + for(var/obj/item/stack/sheet/mineral/silver/S in user.loc) + if(S == newsheet) + continue + if(S.amount >= S.max_amount) + continue + S.attackby(newsheet, user) + to_chat(user, "You melt down the stake and add it to the stack. It now contains [newsheet.amount] sheet\s.") + qdel(src) + else + return ..() + + +// Look up recipes.dm OR pneumaticCannon.dm +/datum/crafting_recipe/silver_stake + name = "Silver Stake" + result = /obj/item/stake/hardened/silver + tools = list(/obj/item/weldingtool) + reqs = list(/obj/item/stack/sheet/mineral/silver = 1, + /obj/item/stake/hardened = 1) + ///obj/item/stack/packageWrap = 8, + ///obj/item/pipe = 2) + time = 80 + category = CAT_WEAPONRY + subcategory = CAT_WEAPON diff --git a/code/modules/antagonists/bloodsucker/objects/bloodsucker_coffin.dm b/code/modules/antagonists/bloodsucker/objects/bloodsucker_coffin.dm new file mode 100644 index 0000000000..946c472f11 --- /dev/null +++ b/code/modules/antagonists/bloodsucker/objects/bloodsucker_coffin.dm @@ -0,0 +1,242 @@ + + +// TRAIT_DEATHCOMA - Activate this when you're in your coffin to simulate sleep/death. + + +// Coffins... +// -heal all wounds, and quickly. +// -restore limbs & organs +// + +// Without Coffins... +// - +// -limbs stay lost + + + +// To put to sleep: use owner.current.fakedeath("bloodsucker") but change name to "bloodsucker_coffin" so you continue to stay fakedeath despite healing in the main thread! + + +/datum/antagonist/bloodsucker/proc/ClaimCoffin(obj/structure/closet/crate/claimed) // NOTE: This can be any "closet" that you are resting AND inside of. + // ALREADY CLAIMED + if(claimed.resident) + if(claimed.resident == owner.current) + to_chat(owner, "This is your [src].") + else + to_chat(owner, "This [src] has already been claimed by another.") + return FALSE + // Bloodsucker Learns new Recipes! + owner.teach_crafting_recipe(/datum/crafting_recipe/bloodsucker/vassalrack) + owner.teach_crafting_recipe(/datum/crafting_recipe/bloodsucker/candelabrum) + // This is my Lair + coffin = claimed + lair = get_area(claimed) + // DONE + to_chat(owner, "You have claimed the [claimed] as your place of immortal rest! Your lair is now [lair].") + to_chat(owner, "You have learned new construction recipes to improve your lair.") + to_chat(owner, "Bloodsucker Tip: Find new lair recipes in the misc tab of the Crafting Menu at the bottom of the screen, including the Persuasion Rack for converting crew into Vassals.
") + RunLair() // Start + return TRUE + +// crate.dm +/obj/structure/closet/crate + var/mob/living/resident // This lets bloodsuckers claim any "closet" as a Coffin, so long as they could get into it and close it. This locks it in place, too. + +/obj/structure/closet/crate/coffin + var/pryLidTimer = 250 + can_weld_shut = FALSE + breakout_time = 200 + + +/obj/structure/closet/crate/coffin/blackcoffin + name = "black coffin" + desc = "For those departed who are not so dear." + icon_state = "coffin" + icon = 'icons/obj/vamp_obj.dmi' + can_weld_shut = FALSE + resistance_flags = 0 // Start off with no bonuses. + open_sound = 'sound/bloodsucker/coffin_open.ogg' + close_sound = 'sound/bloodsucker/coffin_close.ogg' + breakout_time = 600 + pryLidTimer = 400 + resistance_flags = NONE + +/obj/structure/closet/crate/coffin/meatcoffin + name = "meat coffin" + desc = "When you're ready to meat your maker, the steaks can never be too high." + icon_state = "meatcoffin" + icon = 'icons/obj/vamp_obj.dmi' + can_weld_shut = FALSE + resistance_flags = 0 // Start off with no bonuses. + open_sound = 'sound/effects/footstep/slime1.ogg' + close_sound = 'sound/effects/footstep/slime1.ogg' + breakout_time = 200 + pryLidTimer = 200 + resistance_flags = NONE + material_drop = /obj/item/reagent_containers/food/snacks/meat/slab + material_drop_amount = 3 + +/obj/structure/closet/crate/coffin/metalcoffin + name = "metal coffin" + desc = "A big metal sardine can inside of another big metal sardine can, in space." + icon_state = "metalcoffin" + icon = 'icons/obj/vamp_obj.dmi' + can_weld_shut = FALSE + resistance_flags = FIRE_PROOF | LAVA_PROOF + open_sound = 'sound/effects/pressureplate.ogg' + close_sound = 'sound/effects/pressureplate.ogg' + breakout_time = 300 + pryLidTimer = 200 + resistance_flags = NONE + material_drop = /obj/item/stack/sheet/metal + material_drop_amount = 5 + +////////////////////////////////////////////// + +/obj/structure/closet/crate/proc/ClaimCoffin(mob/living/claimant) // NOTE: This can be any "closet" that you are resting AND inside of. + // Bloodsucker Claim + var/datum/antagonist/bloodsucker/bloodsuckerdatum = claimant.mind.has_antag_datum(ANTAG_DATUM_BLOODSUCKER) + if(bloodsuckerdatum) + // Vamp Successfuly Claims Me? + if(bloodsuckerdatum.ClaimCoffin(src)) + resident = claimant + anchored = 1 // No moving this + +/obj/structure/closet/crate/coffin/Destroy() + UnclaimCoffin() + return ..() + +/obj/structure/closet/crate/proc/UnclaimCoffin() + if (resident) + // Vamp Un-Claim + if (resident.mind) + var/datum/antagonist/bloodsucker/bloodsuckerdatum = resident.mind.has_antag_datum(ANTAG_DATUM_BLOODSUCKER) + if (bloodsuckerdatum && bloodsuckerdatum.coffin == src) + bloodsuckerdatum.coffin = null + bloodsuckerdatum.lair = null + to_chat(resident, "You sense that the link with your coffin, your sacred place of rest, has been brokem! You will need to seek another.") + resident = null // Remove resident. Because this object isnt removed from the game immediately (GC?) we need to give them a way to see they don't have a home anymore. + +/obj/structure/closet/crate/coffin/can_open(mob/living/user) + // You cannot lock in/out a coffin's owner. SORRY. + if (locked) + if(user == resident) + if (welded) + welded = FALSE + update_icon() + //to_chat(user, "You flip a secret latch and unlock [src].") // Don't bother. We know it's unlocked. + locked = FALSE + return 1 + else + playsound(get_turf(src), 'sound/machines/door_locked.ogg', 20, 1) + to_chat(user, "[src] is locked tight from the inside.") + return ..() + +/obj/structure/closet/crate/coffin/close(mob/living/user) + var/turf/Turf = get_turf(src) + var/area/A = get_area(src) + if (!..()) + return FALSE + // Only the User can put themself into Torpor (if you're already in it, you'll start to heal) + if((user in src)) + // Bloodsucker Only + var/datum/antagonist/bloodsucker/bloodsuckerdatum = user.mind.has_antag_datum(ANTAG_DATUM_BLOODSUCKER) + if(bloodsuckerdatum) + LockMe(user) + Turf = get_turf(user) //we may have moved. adjust as needed... + A = get_area(src) + // Claim? + if(!bloodsuckerdatum.coffin && !resident && (is_station_level(Turf.z) || !A.map_name == "Space")) + switch(alert(user,"Do you wish to claim this as your coffin? [get_area(src)] will be your lair.","Claim Lair","Yes", "No")) + if("Yes") + ClaimCoffin(user) + if (user.AmStaked()) // Stake? No Heal! + to_chat(bloodsuckerdatum.owner.current, "You are staked! Remove the offending weapon from your heart before sleeping.") + return + // Heal + if(bloodsuckerdatum.HandleHealing(0)) // Healing Mult 0 <--- We only want to check if healing is valid! + to_chat(bloodsuckerdatum.owner.current, "You enter the horrible slumber of deathless Torpor. You will heal until you are renewed.") + bloodsuckerdatum.Torpor_Begin() + // Level Up? + bloodsuckerdatum.SpendRank() // Auto-Fails if not appropriate + return TRUE + +/obj/structure/closet/crate/coffin/attackby(obj/item/W, mob/user, params) + // You cannot weld or deconstruct an owned coffin. STILL NOT SORRY. + if (resident != null && user != resident) // Owner can destroy their own coffin. + if(opened) + if(istype(W, cutting_tool)) + to_chat(user, "This is a much more complex mechanical structure than you thought. You don't know where to begin cutting [src].") + return + else if(anchored && istype(W, /obj/item/wrench)) // Can't unanchor unless owner. + to_chat(user, "The coffin won't come unanchored from the floor.") + return + + if(locked && istype(W, /obj/item/crowbar)) + var/pry_time = pryLidTimer * W.toolspeed // Pry speed must be affected by the speed of the tool. + user.visible_message("[user] tries to pry the lid off of [src] with [W].", \ + "You begin prying the lid off of [src] with [W]. This should take about [DisplayTimeText(pry_time)].") + if (!do_mob(user,src,pry_time)) + return + bust_open() + user.visible_message("[user] snaps the door of [src] wide open.", \ + "The door of [src] snaps open.") + return + ..() + + + +/obj/structure/closet/crate/coffin/AltClick(mob/user) + // Distance Check (Inside Of) + if (user in src) // user.Adjacent(src) + LockMe(user, !locked) + +/obj/structure/closet/crate/proc/LockMe(mob/user, inLocked = TRUE) + // Lock + if (user == resident) + if (!broken) + locked = inLocked + to_chat(user, "You flip a secret latch and [locked?"":"un"]lock yourself inside [src].") + else + to_chat(resident, "The secret latch to lock [src] from the inside is broken. You set it back into place...") + if (do_mob(resident, src, 50))//sleep(10) + if (broken) // Spam Safety + to_chat(resident, "You fix the mechanism and lock it.") + broken = FALSE + locked = TRUE + +// Look up recipes.dm OR pneumaticCannon.dm +/datum/crafting_recipe/bloodsucker/blackcoffin + name = "Black Coffin" + result = /obj/structure/closet/crate/coffin/blackcoffin + tools = list(/obj/item/weldingtool, + /obj/item/screwdriver) + reqs = list(/obj/item/stack/sheet/cloth = 1, + /obj/item/stack/sheet/mineral/wood = 5, + /obj/item/stack/sheet/metal = 1) + ///obj/item/stack/packageWrap = 8, + ///obj/item/pipe = 2) + time = 150 + category = CAT_MISC + always_availible = TRUE + +/datum/crafting_recipe/bloodsucker/meatcoffin + name = "Meat Coffin" + result =/obj/structure/closet/crate/coffin/meatcoffin + tools = list(/obj/item/kitchen/knife, + /obj/item/kitchen/rollingpin) + reqs = list(/obj/item/reagent_containers/food/snacks/meat/slab = 5, + /obj/item/restraints/handcuffs/cable = 1) + time = 150 + category = CAT_MISC + always_availible = TRUE + +/datum/crafting_recipe/bloodsucker/metalcoffin + name = "Metal Coffin" + result =/obj/structure/closet/crate/coffin/metalcoffin + tools = list(/obj/item/weldingtool, + /obj/item/screwdriver) + reqs = list(/obj/item/stack/sheet/metal = 5) + time = 100 + category = CAT_MISC + always_availible = TRUE diff --git a/code/modules/antagonists/bloodsucker/objects/bloodsucker_crypt.dm b/code/modules/antagonists/bloodsucker/objects/bloodsucker_crypt.dm new file mode 100644 index 0000000000..f73912d0f5 --- /dev/null +++ b/code/modules/antagonists/bloodsucker/objects/bloodsucker_crypt.dm @@ -0,0 +1,497 @@ + + + +// IDEAS -- +// An object that disguises your coffin while you're in it! +// +// An object that lets your lair itself protect you from sunlight, like a coffin would (no healing tho) + + + +// Hide a random object somewhere on the station: +// var/turf/targetturf = get_random_station_turf() +// var/turf/targetturf = get_safe_random_station_turf() + + + + +// CRYPT OBJECTS +// +// +// PODIUM Stores your Relics +// +// ALTAR Transmute items into sacred items. +// +// PORTRAIT Gaze into your past to: restore mood boost? +// +// BOOKSHELF Discover secrets about crew and locations. Learn languages. Learn marial arts. +// +// BRAZER Burn rare ingredients to gleen insights. +// +// RUG Ornate, and creaks when stepped upon by any humanoid other than yourself and your vassals. +// +// X COFFIN (Handled elsewhere) +// +// X CANDELABRA (Handled elsewhere) +// +// THRONE Your mental powers work at any range on anyone inside your crypt. +// +// MIRROR Find any person +// +// BUST/STATUE Create terror, but looks just like you (maybe just in Examine?) + + +// RELICS +// +// RITUAL DAGGER +// +// SKULL +// +// VAMPIRIC SCROLL +// +// SAINTS BONES +// +// GRIMOIRE + + +// RARE INGREDIENTS +// Ore +// Books (Manuals) + + +// NOTE: Look up AI and Sentient Disease to see how the game handles the selector logo that only one player is allowed to see. We could add hud for vamps to that? +// ALTERNATIVELY, use the Vamp Huds on relics to mark them, but only show to relevant vamps? + + +/obj/structure/bloodsucker + var/mob/living/owner + +/* +/obj/structure/bloodsucker/bloodthrone + name = "wicked throne" + desc = "Twisted metal shards jut from the arm rests. Very uncomfortable looking. It would take a sadistic sort to sit on this jagged piece of furniture." + +/obj/structure/bloodsucker/bloodaltar + name = "bloody altar" + desc = "It is marble, lined with basalt, and radiates an unnerving chill that puts your skin on edge." + +/obj/structure/bloodsucker/bloodstatue + name = "bloody countenance" + desc = "It looks upsettingly familiar..." + +/obj/structure/bloodsucker/bloodportrait + name = "oil portrait" + desc = "A disturbingly familiar face stares back at you. On second thought, the reds don't seem to be painted in oil..." + +/obj/structure/bloodsucker/bloodbrazer + name = "lit brazer" + desc = "It burns slowly, but doesn't radiate any heat." + +/obj/structure/bloodsucker/bloodmirror + name = "faded mirror" + desc = "You get the sense that the foggy reflection looking back at you has an alien intelligence to it." +*/ + + +/obj/structure/bloodsucker/vassalrack + name = "persuasion rack" + desc = "If this wasn't meant for torture, then someone has some fairly horrifying hobbies." + icon = 'icons/obj/vamp_obj.dmi' + icon_state = "vassalrack" + buckle_lying = FALSE + anchored = FALSE + density = TRUE // Start dense. Once fixed in place, go non-dense. + can_buckle = TRUE + var/useLock = FALSE // So we can't just keep dragging ppl on here. + var/mob/buckled + var/convert_progress = 3 // Resets on each new character to be added to the chair. Some effects should lower it... + var/disloyalty_confirm = FALSE // Command & Antags need to CONFIRM they are willing to lose their role (and will only do it if the Vassal'ing succeeds) + var/disloyalty_offered = FALSE // Has the popup been issued? Don't spam them. + var/convert_cost = 100 + +/obj/structure/bloodsucker/vassalrack/deconstruct(disassembled = TRUE) + new /obj/item/stack/sheet/metal(src.loc, 4) + new /obj/item/stack/rods(loc, 4) + qdel(src) + +/obj/structure/bloodsucker/vassalrack/examine(mob/user) + . = ..() + if((user.mind.has_antag_datum(ANTAG_DATUM_BLOODSUCKER)) || isobserver(user)) + . += {"This is the vassal rack, which allows you to thrall crewmembers into loyal minions in your service."} + . += {"You need to first secure the vassal rack by clicking on it while it is in your lair."} + . += {"Simply click and hold on a victim, and then drag their sprite on the vassal rack."} + . += {"Make sure that the victim is handcuffed, or else they can simply run away or resist, as the process is not instant."} + . += {"To convert the victim, simply click on the vassal rack itself. Sharp weapons work faster than other tools."} +/* if(user.mind.has_antag_datum(ANTAG_DATUM_VASSAL) + . += {"This is the vassal rack, which allows your master to thrall crewmembers into his minions.\n + Aid your master in bringing their victims here and keeping them secure.\n + You can secure victims to the vassal rack by click dragging the victim onto the rack while it is secured"} */ + +/obj/structure/bloodsucker/vassalrack/MouseDrop_T(atom/movable/O, mob/user) + if(!O.Adjacent(src) || O == user || !isliving(O) || !isliving(user) || useLock || has_buckled_mobs() || user.incapacitated()) + return + if(!anchored && user.mind.has_antag_datum(ANTAG_DATUM_BLOODSUCKER)) + to_chat(user, "Until this rack is secured in place, it cannot serve its purpose.") + return + // PULL TARGET: Remember if I was pullin this guy, so we can restore this + var/waspulling = (O == owner.pulling) + var/wasgrabstate = owner.grab_state + // * MOVE! * + O.forceMove(drop_location()) + // PULL TARGET: Restore? + if(waspulling) + owner.start_pulling(O, wasgrabstate, TRUE) + // NOTE: in bs_lunge.dm, we use [target.grabbedby(owner)], which simulates doing a grab action. We don't want that though...we're cutting directly back to where we were in a grab. + // Do Action! + useLock = TRUE + if(do_mob(user, O, 50)) + attach_victim(O,user) + useLock = FALSE + +/obj/structure/bloodsucker/vassalrack/AltClick(mob/user) + if(!has_buckled_mobs() || !isliving(user) || useLock) + return + // Attempt Release (Owner vs Non Owner) + var/mob/living/carbon/C = pick(buckled_mobs) + if(C) + if(user == owner) + unbuckle_mob(C) + else + user_unbuckle_mob(C,user) + +/obj/structure/bloodsucker/vassalrack/proc/attach_victim(mob/living/M, mob/living/user) + // Standard Buckle Check + if(!buckle_mob(M)) // force=TRUE)) + return + // Attempt Buckle + user.visible_message("[user] straps [M] into the rack, immobilizing them.", \ + "You secure [M] tightly in place. They won't escape you now.") + + playsound(src.loc, 'sound/effects/pop_expl.ogg', 25, 1) + //M.forceMove(drop_location()) <--- CANT DO! This cancels the buckle_mob() we JUST did (even if we foced the move) + M.setDir(2) + density = TRUE + var/matrix/m180 = matrix(M.transform) + m180.Turn(180)//90)//180 + animate(M, transform = m180, time = 2) + M.pixel_y = -2 //M.get_standard_pixel_y_offset(120)//180) + update_icon() + // Torture Stuff + convert_progress = 2 // Goes down unless you start over. + disloyalty_confirm = FALSE // New guy gets the chance to say NO if he's special. + disloyalty_offered = FALSE // Prevents spamming torture window. + +/obj/structure/bloodsucker/vassalrack/user_unbuckle_mob(mob/living/M, mob/user) + // Attempt Unbuckle + if(!user.mind.has_antag_datum(ANTAG_DATUM_BLOODSUCKER)) + if(M == user) + M.visible_message("[user] tries to release themself from the rack!",\ + "You attempt to release yourself from the rack!") // For sound if not seen --> "You hear a squishy wet noise.") + else + M.visible_message("[user] tries to pull [M] rack!",\ + "[user] attempts to release you from the rack!") // For sound if not seen --> "You hear a squishy wet noise.") + if(!do_mob(user, M, 100)) + return + // Did the time. Now try to do it. + ..() + unbuckle_mob(M) + +/obj/structure/bloodsucker/vassalrack/unbuckle_mob(mob/living/buckled_mob, force = FALSE) + if(!..()) + return + var/matrix/m180 = matrix(buckled_mob.transform) + m180.Turn(180)//-90)//180 + animate(buckled_mob, transform = m180, time = 2) + buckled_mob.pixel_y = buckled_mob.get_standard_pixel_y_offset(180) + src.visible_message(text("[buckled_mob][buckled_mob.stat==DEAD?"'s corpse":""] slides off of the rack.")) + density = FALSE + buckled_mob.AdjustKnockdown(30) + update_icon() + useLock = FALSE // Failsafe + +/obj/structure/bloodsucker/vassalrack/attackby(obj/item/W, mob/user, params) + if(has_buckled_mobs()) // Attack w/weapon vs guy standing there? Don't do an attack. + attack_hand(user) + return FALSE + return ..() + +/obj/structure/bloodsucker/vassalrack/attack_hand(mob/user) + //. = ..() // Taken from sacrificial altar in divine.dm + //if(.) + // return + // Go away. Torturing. + if(useLock) + return + var/datum/antagonist/bloodsucker/bloodsuckerdatum = user.mind.has_antag_datum(ANTAG_DATUM_BLOODSUCKER) + // CHECK ONE: Am I claiming this? Is it in the right place? + if(istype(bloodsuckerdatum) && !owner) + if(!bloodsuckerdatum.lair) + to_chat(user, "You don't have a lair. Claim a coffin to make that location your lair.") + if(bloodsuckerdatum.lair != get_area(src)) + to_chat(user, "You may only activate this structure in your lair: [bloodsuckerdatum.lair].") + return + switch(alert(user,"Do you wish to afix this structure here? Be aware you wont be able to unsecure it anymore","Secure [src]","Yes", "No")) + if("Yes") + owner = user + density = FALSE + anchored = TRUE + return //No, you cant move this ever again + // No One Home + if(!has_buckled_mobs()) + return + // CHECK TWO: Am I a non-bloodsucker? + var/mob/living/carbon/C = pick(buckled_mobs) + if(!istype(bloodsuckerdatum)) + // Try to release this guy + user_unbuckle_mob(C, user) + return + // Bloodsucker Owner! Let the boy go. + if(C.mind) + var/datum/antagonist/vassal/vassaldatum = C.mind.has_antag_datum(ANTAG_DATUM_VASSAL) + if (istype(vassaldatum) && vassaldatum.master == bloodsuckerdatum || C.stat >= DEAD) + unbuckle_mob(C) + useLock = FALSE // Failsafe + return + // Just torture the boy + torture_victim(user, C) + +/obj/structure/bloodsucker/vassalrack/proc/torture_victim(mob/living/user, mob/living/target) + // Check Bloodmob/living/M, force = FALSE, check_loc = TRUE + if(user.blood_volume < convert_cost + 5) + to_chat(user, "You don't have enough blood to initiate the Dark Communion with [target].") + return + // Prep... + useLock = TRUE + // Step One: Tick Down Conversion from 3 to 0 + // Step Two: Break mindshielding/antag (on approve) + // Step Three: Blood Ritual + // Conversion Process + if(convert_progress > 0) + to_chat(user, "You prepare to initiate [target] into your service.") + if(!do_torture(user,target)) + to_chat(user, "The ritual has been interrupted!") + else + convert_progress -- // Ouch. Stop. Don't. + // All done! + if(convert_progress <= 0) + // FAIL: Can't be Vassal + if(!SSticker.mode.can_make_vassal(target, user, display_warning=FALSE) && HAS_TRAIT(target, TRAIT_MINDSHIELD)) // If I'm an unconvertable Antag ONLY + to_chat(user, "[target] doesn't respond to your persuasion. It doesn't appear they can be converted to follow you, they either have a mindshield or their external loyalties are too difficult for you to break.\[ALT+click to release\]") + convert_progress ++ // Pop it back up some. Avoids wasting Blood on a lost cause. + // SUCCESS: All done! + else + if(RequireDisloyalty(target)) + to_chat(user, "[target] has external loyalties! [target.p_they(TRUE)] will require more persuasion to break [target.p_them()] to your will!") + else + to_chat(user, "[target] looks ready for the Dark Communion.") + // Still Need More Persuasion... + else + to_chat(user, "[target] could use [convert_progress == 1?"a little":"some"] more persuasion.") + useLock = FALSE + return + // Check: Mindshield & Antag + if(!disloyalty_confirm && RequireDisloyalty(target)) + if(!do_disloyalty(user,target)) + to_chat(user, "The ritual has been interrupted!") + else if (!disloyalty_confirm) + to_chat(user, "[target] refuses to give into your persuasion. Perhaps a little more?") + else + to_chat(user, "[target] looks ready for the Dark Communion.") + useLock = FALSE + return + // Check: Blood + if(user.blood_volume < convert_cost) + to_chat(user, "You don't have enough blood to initiate the Dark Communion with [target].") + useLock = FALSE + return + var/datum/antagonist/bloodsucker/bloodsuckerdatum = user.mind.has_antag_datum(ANTAG_DATUM_BLOODSUCKER) + bloodsuckerdatum.AddBloodVolume(-convert_cost) + target.add_mob_blood(user) + user.visible_message("[user] marks a bloody smear on [target]'s forehead and puts a wrist up to [target.p_their()] mouth!", \ + "You paint a bloody marking across [target]'s forehead, place your wrist to [target.p_their()] mouth, and subject [target.p_them()] to the Dark Communion.") + if(!do_mob(user, src, 50)) + to_chat(user, "The ritual has been interrupted!") + useLock = FALSE + return + // Convert to Vassal! + if(bloodsuckerdatum && bloodsuckerdatum.attempt_turn_vassal(target)) + //remove_loyalties(target) // In case of Mindshield, or appropriate Antag (Traitor, Internal, etc) + //if (!target.buckled) + // to_chat(user, "The ritual has been interrupted!") + // useLock = FALSE + // return + user.playsound_local(null, 'sound/effects/explosion_distant.ogg', 40, 1) // Play THIS sound for user only. The "null" is where turf would go if a location was needed. Null puts it right in their head. + target.playsound_local(null, 'sound/effects/explosion_distant.ogg', 40, 1) // Play THIS sound for user only. The "null" is where turf would go if a location was needed. Null puts it right in their head. + target.playsound_local(null, 'sound/effects/singlebeat.ogg', 40, 1) // Play THIS sound for user only. The "null" is where turf would go if a location was needed. Null puts it right in their head. + target.Jitter(25) + target.emote("laugh") + //remove_victim(target) // Remove on CLICK ONLY! + useLock = FALSE + +/obj/structure/bloodsucker/vassalrack/proc/do_torture(mob/living/user, mob/living/target, mult=1) + var/torture_time = 15 // Fifteen seconds if you aren't using anything. Shorter with weapons and such. + var/torture_dmg_brute = 2 + var/torture_dmg_burn = 0 + // Get Bodypart + var/target_string = "" + var/obj/item/bodypart/BP = null + if(iscarbon(target)) + var/mob/living/carbon/C = target + BP = pick(C.bodyparts) + if(BP) + target_string += BP.name + // Get Weapon + var/obj/item/I = user.get_active_held_item() + if(!istype(I)) + I = user.get_inactive_held_item() + // Create Strings + var/method_string = I?.attack_verb?.len ? pick(I.attack_verb) : pick("harmed","tortured","wrenched","twisted","scoured","beaten","lashed","scathed") + var/weapon_string = I ? I.name : pick("bare hands","hands","fingers","fists") + // Weapon Bonus + SFX + if(I) + torture_time -= I.force / 4 + torture_dmg_brute += I.force / 4 + //torture_dmg_burn += I. + if(I.sharpness == IS_SHARP) + torture_time -= 1 + else if(I.sharpness == IS_SHARP_ACCURATE) + torture_time -= 2 + if(istype(I, /obj/item/weldingtool)) + var/obj/item/weldingtool/welder = I + welder.welding = TRUE + torture_time -= 5 + torture_dmg_burn += 5 + I.play_tool_sound(target) + torture_time = max(50, torture_time * 10) // Minimum 5 seconds. + // Now run process. + if(!do_mob(user, target, torture_time * mult)) + return FALSE + // SUCCESS + if(I) + playsound(loc, I.hitsound, 30, 1, -1) + I.play_tool_sound(target) + target.visible_message("[user] has [method_string] [target]'s [target_string] with [user.p_their()] [weapon_string]!", \ + "[user] has [method_string] your [target_string] with [user.p_their()] [weapon_string]!") + if(!target.is_muzzled()) + target.emote("scream") + target.Jitter(5) + target.apply_damages(brute = torture_dmg_brute, burn = torture_dmg_burn, def_zone = (BP ? BP.body_zone : null)) // take_overall_damage(6,0) + return TRUE + +/obj/structure/bloodsucker/vassalrack/proc/do_disloyalty(mob/living/user, mob/living/target) + + // OFFER YES/NO NOW! + spawn(10) + if(useLock && target && target.client) // Are we still torturing? Did we cancel? Are they still here? + to_chat(user, "[target] has been given the opportunity for servitude. You await their decision...") + var/alert_text = "You are being tortured! Do you want to give in and pledge your undying loyalty to [user]?" + /* if(HAS_TRAIT(target, TRAIT_MINDSHIELD)) + alert_text += "\n\nYou will no longer be loyal to the station!" + if(SSticker.mode.AmValidAntag(target.mind)) */ + alert_text += "\n\nYou will not lose your current objectives, but they come second to the will of your new master!" + switch(alert(target, alert_text,"THE HORRIBLE PAIN! WHEN WILL IT END?!","Yes, Master!", "NEVER!")) + if("Yes, Master!") + disloyalty_accept(target) + else + disloyalty_refuse(target) + if(!do_torture(user,target, 2)) + return FALSE + + // NOTE: We only remove loyalties when we're CONVERTED! + return TRUE + +/obj/structure/bloodsucker/vassalrack/proc/RequireDisloyalty(mob/living/target) + return SSticker.mode.AmValidAntag(target.mind) //|| HAS_TRAIT(target, TRAIT_MINDSHIELD) + +/obj/structure/bloodsucker/vassalrack/proc/disloyalty_accept(mob/living/target) + // FAILSAFE: Still on the rack? + if(!(locate(target) in buckled_mobs)) + return + // NOTE: You can say YES after torture. It'll apply to next time. + disloyalty_confirm = TRUE + /*if(HAS_TRAIT(target, TRAIT_MINDSHIELD)) + to_chat(target, "You give in to the will of your torturer. If they are successful, you will no longer be loyal to the station!") +*/ +/obj/structure/bloodsucker/vassalrack/proc/disloyalty_refuse(mob/living/target) + // FAILSAFE: Still on the rack? + if(!(locate(target) in buckled_mobs)) + return + // Failsafe: You already said YES. + if(disloyalty_confirm) + return + to_chat(target, "You refuse to give in! You will not break!") + + +/obj/structure/bloodsucker/vassalrack/proc/remove_loyalties(mob/living/target) + // Find Mind Implant & Destroy + if(HAS_TRAIT(target, TRAIT_MINDSHIELD)) + for(var/obj/item/implant/I in target.implants) + if(I.type == /obj/item/implant/mindshield) + I.removed(target,silent=TRUE) + +//////////////////////////////////////////////////////////////////////////////////////////////////////////////////// + +/obj/structure/bloodsucker/candelabrum + name = "candelabrum" + desc = "It burns slowly, but doesn't radiate any heat." + icon = 'icons/obj/vamp_obj.dmi' + icon_state = "candelabrum" + light_color = "#66FFFF"//LIGHT_COLOR_BLUEGREEN // lighting.dm + light_power = 3 + light_range = 0 // to 2 + density = FALSE + anchored = FALSE + var/lit = FALSE +///obj/structure/bloodsucker/candelabrum/is_hot() // candle.dm + //return FALSE + +/obj/structure/bloodsucker/candelabrum/Destroy() + STOP_PROCESSING(SSobj, src) + +/obj/structure/bloodsucker/candelabrum/update_icon() + icon_state = "candelabrum[lit ? "_lit" : ""]" + +/obj/structure/bloodsucker/candelabrum/examine(mob/user) + . = ..() + if((user.mind.has_antag_datum(ANTAG_DATUM_BLOODSUCKER)) || isobserver(user)) + . += {"This is a magical candle which drains at the sanity of mortals who are not under your command while it is active."} + . += {"You can alt click on it from any range to turn it on remotely, or simply be next to it and click on it to turn it on and off normally."} +/* if(user.mind.has_antag_datum(ANTAG_DATUM_VASSAL) + . += {"This is a magical candle which drains at the sanity of the fools who havent yet accepted your master, as long as it is active.\n + You can turn it on and off by clicking on it while you are next to it"} */ + +/obj/structure/bloodsucker/candelabrum/attack_hand(mob/user) + var/datum/antagonist/bloodsucker/V = user.mind.has_antag_datum(ANTAG_DATUM_BLOODSUCKER) //I wish there was a better way to do this + var/datum/antagonist/vassal/T = user.mind.has_antag_datum(ANTAG_DATUM_VASSAL) + if(istype(V) || istype(T)) + toggle() + +/obj/structure/bloodsucker/candelabrum/AltClick(mob/user) + var/datum/antagonist/bloodsucker/V = user.mind.has_antag_datum(ANTAG_DATUM_BLOODSUCKER) + // Bloodsuckers can turn their candles on from a distance. SPOOOOKY. + if(istype(V)) + toggle() + +/obj/structure/bloodsucker/candelabrum/proc/toggle(mob/user) + lit = !lit + if(lit) + set_light(2, 3, "#66FFFF") + START_PROCESSING(SSobj, src) + else + set_light(0) + STOP_PROCESSING(SSobj, src) + update_icon() + +/obj/structure/bloodsucker/candelabrum/process() + if(lit) + for(var/mob/living/carbon/human/H in viewers(7, src)) + var/datum/antagonist/vassal/T = H.mind.has_antag_datum(ANTAG_DATUM_VASSAL) + var/datum/antagonist/bloodsucker/V = H.mind.has_antag_datum(ANTAG_DATUM_BLOODSUCKER) + if(V || T) //We dont want vassals or vampires affected by this + return + H.hallucination = 20 + SEND_SIGNAL(H, COMSIG_ADD_MOOD_EVENT, "vampcandle", /datum/mood_event/vampcandle) +//////////////////////////////////////////////////////////////////////////////////////////////////////////////////// +// OTHER THINGS TO USE: HUMAN BLOOD. /obj/effect/decal/cleanable/blood + +/obj/item/restraints/legcuffs/beartrap/bloodsucker diff --git a/code/modules/antagonists/bloodsucker/objects/bloodsucker_lair.dm b/code/modules/antagonists/bloodsucker/objects/bloodsucker_lair.dm new file mode 100644 index 0000000000..f68191d6d7 --- /dev/null +++ b/code/modules/antagonists/bloodsucker/objects/bloodsucker_lair.dm @@ -0,0 +1,88 @@ + + +// Created by claiming a Coffin. + + + +// THINGS TO SPAWN: +// +// /obj/effect/decal/cleanable/cobweb && /obj/effect/decal/cleanable/cobweb/cobweb2 +// /obj/effect/decal/cleanable/generic +// /obj/effect/decal/cleanable/dirt/dust <-- Pretty cool, just stains the tile itself. +// /obj/effect/decal/cleanable/blood/old + +/* +/area/ + // All coffins assigned to this area + var/list/obj/structure/closet/crate/laircoffins = new list() + +// Called by Coffin when an area is claimed as a vamp's lair +/area/proc/ClaimAsLair(/obj/structure/closet/crate/inClaimant) + set waitfor = FALSE // Don't make on_gain() wait for this function to finish. This lets this code run on the side. + + laircoffins += laircoffins + sleep() + + // Cancel! + if (laircoffins.len == 0) + return + */ + +/datum/antagonist/bloodsucker/proc/RunLair() + set waitfor = FALSE // Don't make on_gain() wait for this function to finish. This lets this code run on the side. + while(!AmFinalDeath() && coffin && lair) + // WAit 2 min and Repeat + sleep(120) + // Coffin Moved SOMEHOW? + if(lair != get_area(coffin)) + if(coffin) + coffin.UnclaimCoffin() + //lair = get_area(coffin) + break // DONE + var/list/turf/area_turfs = get_area_turfs(lair) + // Create Dirt etc. + var/turf/T_Dirty = pick(area_turfs) + if(T_Dirty && !T_Dirty.density) + // Default: Dirt + // CHECK: Cobweb already there? + //if (!locate(var/obj/effect/decal/cleanable/cobweb) in T_Dirty) // REMOVED! Cleanables don't stack. + // STEP ONE: COBWEBS + // CHECK: Wall to North? + var/turf/check_N = get_step(T_Dirty, NORTH) + if(istype(check_N, /turf/closed/wall)) + // CHECK: Wall to West? + var/turf/check_W = get_step(T_Dirty, WEST) + if(istype(check_W, /turf/closed/wall)) + new /obj/effect/decal/cleanable/cobweb (T_Dirty) + // CHECK: Wall to East? + var/turf/check_E = get_step(T_Dirty, EAST) + if(istype(check_E, /turf/closed/wall)) + new /obj/effect/decal/cleanable/cobweb/cobweb2 (T_Dirty) + // STEP TWO: DIRT + new /obj/effect/decal/cleanable/dirt (T_Dirty) + // Find Animals in Area + /* if(rand(0,2) == 0) + var/mobCount = 0 + var/mobMax = CLAMP(area_turfs.len / 25, 1, 4) + for (var/turf/T in area_turfs) + if(!T) continue + var/mob/living/simple_animal/SA = locate() in T + if(SA) + mobCount ++ + if (mobCount >= mobMax) // Already at max + break + Spawn One + if(mobCount < mobMax) + Seek Out Location + while(area_turfs.len > 0) + var/turf/T = pick(area_turfs) // We use while&pick instead of a for/loop so it's random, rather than from the top of the list. + if(T && !T.density) + var/mob/living/simple_animal/SA = /mob/living/simple_animal/mouse // pick(/mob/living/simple_animal/mouse,/mob/living/simple_animal/mouse,/mob/living/simple_animal/mouse, /mob/living/simple_animal/hostile/retaliate/bat) //prob(300) /mob/living/simple_animal/mouse, + new SA (T) + break + area_turfs -= T*/ + // NOTE: area_turfs is now cleared out! + if(coffin) + coffin.UnclaimCoffin() + // Done (somehow) + lair = null diff --git a/code/modules/antagonists/bloodsucker/powers/bs_brawn.dm b/code/modules/antagonists/bloodsucker/powers/bs_brawn.dm new file mode 100644 index 0000000000..49aada3611 --- /dev/null +++ b/code/modules/antagonists/bloodsucker/powers/bs_brawn.dm @@ -0,0 +1,174 @@ + + +/datum/action/bloodsucker/targeted/brawn + name = "Brawn"//"Cellular Emporium" + desc = "Snap restraints with ease, or deal terrible damage with your bare hands." + button_icon_state = "power_strength" + bloodcost = 10 + cooldown = 130 + target_range = 1 + power_activates_immediately = TRUE + message_Trigger = ""//"Whom will you subvert to your will?" + must_be_capacitated = TRUE + can_be_immobilized = TRUE + bloodsucker_can_buy = TRUE + // Level Up + var/upgrade_canLocker = FALSE + var/upgrade_canDoor = FALSE + +/datum/action/bloodsucker/targeted/brawn/CheckCanUse(display_error) + . = ..() + if(!.) + return + . = TRUE + // Break Out of Restraints! (And then cancel) + if(CheckBreakRestraints()) + //PowerActivatedSuccessfully() // PAY COST! BEGIN COOLDOWN!DEACTIVATE! + . = FALSE //return FALSE + // Throw Off Attacker! (And then cancel) + if(CheckEscapePuller()) + //PowerActivatedSuccessfully() // PAY COST! BEGIN COOLDOWN!DEACTIVATE! + . = FALSE //return FALSE + /*if(CheckBreakLocker()) + .= FALSE */ + // Did we successfuly use power to BREAK CUFFS and/or ESCAPE PULLER and/or escape from a locker? + // Then PAY COST! + if(. == FALSE) + PowerActivatedSuccessfully() // PAY COST! BEGIN COOLDOWN!DEACTIVATE! + + // NOTE: We use . = FALSE so that we can break cuffs AND throw off our attacker in one use! + //return TRUE +/datum/action/bloodsucker/targeted/brawn/CheckValidTarget(atom/A) + return isliving(A) || istype(A, /obj/machinery/door) + +/datum/action/bloodsucker/targeted/brawn/CheckCanTarget(atom/A, display_error) + // DEFAULT CHECKS (Distance) + if(!..()) // Disable range notice for Brawn. + return FALSE + // Must outside Closet to target anyone! + if(!isturf(owner.loc)) + return FALSE + // Check: Self + if(A == owner) + return FALSE + // Target Type: Living + if(isliving(A)) + return TRUE + // Target Type: Door + else if(istype(A, /obj/machinery/door)) + return TRUE + return ..() // yes, FALSE! You failed if you got here! BAD TARGET + +/datum/action/bloodsucker/targeted/brawn/FireTargetedPower(atom/A) + // set waitfor = FALSE <---- DONT DO THIS!We WANT this power to hold up ClickWithPower(), so that we can unlock the power when it's done. + var/mob/living/carbon/target = A + var/mob/living/user = owner + // Target Type: Mob + if(isliving(target)) + var/mob/living/carbon/user_C = user + var/hitStrength = user_C.dna.species.punchdamagehigh * 1.3 + 5 + // Knockdown! + var/powerlevel = min(5, 1 + level_current) + if(rand(5 + powerlevel) >= 5) + target.visible_message("[user] lands a vicious punch, sending [target] away!", \ + "[user] has landed a horrifying punch on you, sending you flying!!", null, COMBAT_MESSAGE_RANGE) + target.Knockdown(min(5, rand(10, 10 * powerlevel)) ) + // Chance of KO + if(rand(6 + powerlevel) >= 6 && target.stat <= UNCONSCIOUS) + target.Unconscious(40) + // Attack! + playsound(get_turf(target), 'sound/weapons/punch4.ogg', 60, 1, -1) + user.do_attack_animation(target, ATTACK_EFFECT_SMASH) + var/obj/item/bodypart/affecting = target.get_bodypart(ran_zone(target.zone_selected)) + target.apply_damage(hitStrength, BRUTE, affecting) + // Knockback + var/send_dir = get_dir(owner, target) + var/turf/T = get_ranged_target_turf(target, send_dir, powerlevel) + owner.newtonian_move(send_dir) // Bounce back in 0 G + target.throw_at(T, powerlevel, TRUE, owner) //new /datum/forced_movement(target, get_ranged_target_turf(target, send_dir, (hitStrength / 4)), 1, FALSE) + // Target Type: Door + else if(istype(target, /obj/machinery/door)) + var/obj/machinery/door/D = target + playsound(get_turf(usr), 'sound/machines/airlock_alien_prying.ogg', 40, 1, -1) + to_chat(user, "You prepare to tear open [D].") + if(do_mob(usr,target,25)) + if (D.Adjacent(user)) + to_chat(user, "You tear open the [D].") + user.Stun(10) + user.do_attack_animation(D, ATTACK_EFFECT_SMASH) + playsound(get_turf(D), 'sound/effects/bang.ogg', 30, 1, -1) + D.open(2) // open(2) is like a crowbar or jaws of life. + // Target Type: Closet + +/datum/action/bloodsucker/targeted/brawn/proc/CheckBreakRestraints() + if(!iscarbon(owner)) // || !owner.restrained() + return FALSE + // (NOTE: Just like biodegrade.dm, we only remove one thing per use // + // Destroy Cuffs + var/mob/living/carbon/user_C = owner + //message_admins("DEBUG3: attempt_cast() [name] / [user_C.handcuffed] ") + if(user_C.handcuffed) + var/obj/O = user_C.get_item_by_slot(SLOT_HANDCUFFED) + if(istype(O)) + //user_C.visible_message("[user_C] attempts to remove [O]!", \ + // "You snap [O] like it's nothing!") + user_C.clear_cuffs(O,TRUE) + playsound(get_turf(usr), 'sound/effects/grillehit.ogg', 80, 1, -1) + return TRUE +/* Doesnt work + // Destroy Straightjacket + if(ishuman(owner)) + var/mob/living/carbon/human/user_H = owner + if(user_H.wear_suit && user_H.wear_suit.breakouttime) + var/obj/item/clothing/suit/straight_jacket/S = user_H.get_item_by_slot(ITEM_SLOT_ICLOTHING) + if(istype(S)) + user_C.visible_message("[user_C] attempts to remove [S]!", \ + "You rip through [S] like it's nothing!") + user_C.clear_cuffs(S,TRUE) + playsound(get_turf(usr), 'sound/effects/grillehit.ogg', 80, 1, -1) + return TRUE */ + // Destroy Leg Cuffs + if(user_C.legcuffed) + var/obj/O = user_C.get_item_by_slot(SLOT_LEGCUFFED) + if(istype(O)) + //user_C.visible_message("[user_C] attempts to remove [O]!", \ + // "You snap [O] like it's nothing!") + user_C.clear_cuffs(O,TRUE) + playsound(get_turf(usr), 'sound/effects/grillehit.ogg', 80, 1, -1) + return TRUE + return FALSE + +/datum/action/bloodsucker/targeted/brawn/proc/CheckEscapePuller() + if(!owner.pulledby)// || owner.pulledby.grab_state <= GRAB_PASSIVE) + return FALSE + var/mob/M = owner.pulledby + var/pull_power = M.grab_state + playsound(get_turf(M), 'sound/effects/woodhit.ogg', 75, 1, -1) + // Knock Down (if Living) + if (isliving(M)) + var/mob/living/L = M + L.Knockdown(pull_power * 10 + 20) + // Knock Back (before Knockdown, which probably cancels pull) + var/send_dir = get_dir(owner, M) + var/turf/T = get_ranged_target_turf(M, send_dir, pull_power) + owner.newtonian_move(send_dir) // Bounce back in 0 G + M.throw_at(T, pull_power, TRUE, owner, FALSE) // Throw distance based on grab state! Harder grabs punished more aggressively. + // /proc/log_combat(atom/user, atom/target, what_done, atom/object=null, addition=null) + log_combat(owner, M, "used Brawn power") + owner.visible_message("[owner] tears free of [M]'s grasp!", \ + "You shrug off [M]'s grasp!") + owner.pulledby = null // It's already done, but JUST IN CASE. + return TRUE +/* Doesnt work +/datum/action/bloodsucker/targeted/brawn/proc/CheckBreakLocker() + if(!istype(owner.loc, /obj/structure/closet)) + return FALSE + playsound(get_turf(owner), 'sound/machines/airlock_alien_prying.ogg', 40, 1, -1) + if(do_mob(owner ,target, 25)) + var/obj/structure/closet/C = owner.loc + to_chat(owner, "You prepare to tear open the [C].") + owner.do_attack_animation(C, ATTACK_EFFECT_SMASH) + playsound(get_turf(C), 'sound/effects/bang.ogg', 30, 1, -1) + C.bust_open() + return TRUE +*/ diff --git a/code/modules/antagonists/bloodsucker/powers/bs_cloak.dm b/code/modules/antagonists/bloodsucker/powers/bs_cloak.dm new file mode 100644 index 0000000000..cea942e26d --- /dev/null +++ b/code/modules/antagonists/bloodsucker/powers/bs_cloak.dm @@ -0,0 +1,57 @@ + + +/datum/action/bloodsucker/cloak + name = "Cloak of Darkness" + desc = "Blend into the shadows and become invisible to the untrained eye." + button_icon_state = "power_cloak" + bloodcost = 5 + cooldown = 50 + bloodsucker_can_buy = TRUE + amToggle = TRUE + warn_constant_cost = TRUE + + var/light_min = 0.5 // If lum is above this, no good. + +/datum/action/bloodsucker/cloak/CheckCanUse(display_error) + . = ..() + if(!.) + return + // Must be Dark + var/turf/T = owner.loc + if(istype(T) && T.get_lumcount() > light_min) + to_chat(owner, "This area is not dark enough to blend in") + return FALSE + return TRUE + +/datum/action/bloodsucker/cloak/ActivatePower() + var/datum/antagonist/bloodsucker/bloodsuckerdatum = owner.mind.has_antag_datum(ANTAG_DATUM_BLOODSUCKER) + var/mob/living/user = owner + var/was_running = (user.m_intent == MOVE_INTENT_RUN) + if(was_running) + user.toggle_move_intent() + ADD_TRAIT(user, TRAIT_NORUNNING, "cloak of darkness") + while(bloodsuckerdatum && ContinueActive(user) || user.m_intent == MOVE_INTENT_RUN) + // Pay Blood Toll (if awake) + owner.alpha = max(0, owner.alpha - min(75, 20 + 15 * level_current)) + bloodsuckerdatum.AddBloodVolume(-0.2) + sleep(5) // Check every few ticks that we haven't disabled this power + // Return to Running (if you were before) + if(was_running && user.m_intent != MOVE_INTENT_RUN) + user.toggle_move_intent() + +/datum/action/bloodsucker/cloak/ContinueActive(mob/living/user, mob/living/target) + if (!..()) + return FALSE + if(user.stat == !CONSCIOUS) // Must be CONSCIOUS + to_chat(owner, "Your cloak failed due to you falling unconcious! ") + return FALSE + var/turf/T = owner.loc // Must be DARK + if(istype(T) && T.get_lumcount() > light_min) + to_chat(owner, "Your cloak failed due to there being too much light!") + return FALSE + return TRUE + +/datum/action/bloodsucker/cloak/DeactivatePower(mob/living/user = owner, mob/living/target) + ..() + REMOVE_TRAIT(user, TRAIT_NORUNNING, "cloak of darkness") + user.alpha = 255 diff --git a/code/modules/antagonists/bloodsucker/powers/bs_feed.dm b/code/modules/antagonists/bloodsucker/powers/bs_feed.dm new file mode 100644 index 0000000000..7c4cf46e3c --- /dev/null +++ b/code/modules/antagonists/bloodsucker/powers/bs_feed.dm @@ -0,0 +1,324 @@ + + +/datum/action/bloodsucker/feed + name = "Feed" + desc = "Draw the heartsblood of living victims in your grasp.
None/Passive: Feed silently and unnoticed by your victim.
Aggressive: Subdue your target quickly." + button_icon_state = "power_feed" + + bloodcost = 0 + cooldown = 30 + amToggle = TRUE + bloodsucker_can_buy = TRUE + can_be_staked = TRUE + cooldown_static = TRUE + + var/notice_range = 2 // Distance before silent feeding is noticed. + var/mob/living/feed_target // So we can validate more than just the guy we're grappling. + var/target_grappled = FALSE // If you started grappled, then ending it will end your Feed. + +/datum/action/bloodsucker/feed/CheckCanUse(display_error) + . = ..() + if(!.) + return + // Wearing mask + var/mob/living/L = owner + if (L.is_mouth_covered()) + if (display_error) + to_chat(owner, "You cannot feed with your mouth covered! Remove your mask.") + return FALSE + // Find my Target! + if (!FindMyTarget(display_error)) // Sets feed_target within after Validating + return FALSE + // Not in correct state + // DONE! + return TRUE + +/datum/action/bloodsucker/feed/proc/ValidateTarget(mob/living/target, display_error) // Called twice: validating a subtle victim, or validating your grapple victim. + // Bloodsuckers + Animals MUST be grabbed aggressively! + if (!owner.pulling || target == owner.pulling && owner.grab_state < GRAB_AGGRESSIVE) + // NOTE: It's OKAY that we are checking if(!target) below, AFTER animals here. We want passive check vs animal to warn you first, THEN the standard warning. + // Animals: + if (isliving(target) && !iscarbon(target)) + if (display_error) + to_chat(owner, "Lesser beings require a tighter grip.") + return FALSE + // Bloodsuckers: + else if (iscarbon(target) && target.mind && target.mind.has_antag_datum(ANTAG_DATUM_BLOODSUCKER)) + if (display_error) + to_chat(owner, "Other Bloodsuckers will not fall for your subtle approach.") + return FALSE + // Must have Target + if (!target) // || !ismob(target) + if (display_error) + to_chat(owner, "You must be next to or grabbing a victim to feed from them.") + return FALSE + // Not even living! + if (!isliving(target) || issilicon(target)) + if (display_error) + to_chat(owner, "You may only feed from living beings.") + return FALSE + if (target.blood_volume <= 0) + if (display_error) + to_chat(owner, "Your victim has no blood to take.") + return FALSE + if (ishuman(target)) + var/mob/living/carbon/human/H = target + if(NOBLOOD in H.dna.species.species_traits)// || owner.get_blood_id() != target.get_blood_id()) + if (display_error) + to_chat(owner, "Your victim's blood is not suitable for you to take.") + return FALSE + return TRUE + +// If I'm not grabbing someone, find me someone nearby. +/datum/action/bloodsucker/feed/proc/FindMyTarget(display_error) + // Default + feed_target = null + target_grappled = FALSE + // If you are pulling a mob, that's your target. If you don't like it, then release them. + if (owner.pulling && ismob(owner.pulling)) + // Check grapple target Valid + if (!ValidateTarget(owner.pulling, display_error)) // Grabbed targets display error. + return FALSE + target_grappled = TRUE + feed_target = owner.pulling + return TRUE + // Find Targets + var/list/mob/living/seen_targets = view(1, owner) + var/list/mob/living/seen_mobs = list() + for(var/mob/living/M in seen_targets) + if (isliving(M) && M != owner) + seen_mobs += M + // None Seen! + if (seen_mobs.len == 0) + if (display_error) + to_chat(owner, "You must be next to or grabbing a victim to feed from them.") + return FALSE + // Check Valids... + var/list/targets_valid = list() + var/list/targets_dead = list() + for(var/mob/living/M in seen_mobs) + // Check adjecent Valid target + if (M != owner && ValidateTarget(M, display_error = FALSE)) // Do NOT display errors. We'll be doing this again in CheckCanUse(), which will rule out grabbed targets. + // Prioritize living, but remember dead as backup + if (M.stat < DEAD) + targets_valid += M + else + targets_dead += M + // No Living? Try dead. + if (targets_valid.len == 0 && targets_dead.len > 0) + targets_valid = targets_dead + // No Targets + if (targets_valid.len == 0) + // Did I see targets? Then display at least one error + if (seen_mobs.len > 1) + if (display_error) + to_chat(owner, "None of these are valid targets to feed from subtly.") + else + ValidateTarget(seen_mobs[1], display_error) + return FALSE + // Too Many Targets + //else if (targets.len > 1) + // if (display_error) + // to_chat(owner, "You are adjecent to too many witnesses. Either grab your victim or move away.") + // return FALSE + // One Target! + else + feed_target = pick(targets_valid)//targets[1] + return TRUE + +/datum/action/bloodsucker/feed/ActivatePower() + // set waitfor = FALSE <---- DONT DO THIS!We WANT this power to hold up Activate(), so Deactivate() can happen after. + var/mob/living/target = feed_target // Stored during CheckCanUse(). Can be a grabbed OR adjecent character. + var/mob/living/user = owner + var/datum/antagonist/bloodsucker/bloodsuckerdatum = user.mind.has_antag_datum(ANTAG_DATUM_BLOODSUCKER) + // Am I SECRET or LOUD? It stays this way the whole time! I must END IT to try it the other way. + var/amSilent = (!target_grappled || owner.grab_state <= GRAB_PASSIVE) // && iscarbon(target) // Non-carbons (animals) not passive. They go straight into aggressive. + // Initial Wait + var/feed_time = (amSilent ? 45 : 25) - (2.5 * level_current) + feed_time = max(15, feed_time) + if (amSilent) + to_chat(user, "You lean quietly toward [target] and secretly draw out your fangs...") + else + to_chat(user, "You pull [target] close to you and draw out your fangs...") + if (!do_mob(user, target, feed_time,0,1,extra_checks=CALLBACK(src, .proc/ContinueActive, user, target)))//sleep(10) + to_chat(user, "Your feeding was interrupted.") + //DeactivatePower(user,target) + return + // Put target to Sleep (Bloodsuckers are immune to their own bite's sleep effect) + if (!amSilent) + ApplyVictimEffects(target) // Sleep, paralysis, immobile, unconscious, and mute + if(target.stat <= UNCONSCIOUS) + sleep(1) + // Wait, then Cancel if Invalid + if (!ContinueActive(user,target)) // Cancel. They're gone. + //DeactivatePower(user,target) + return + // Pull Target Close + if (!target.density) // Pull target to you if they don't take up space. + target.Move(user.loc) + // Broadcast Message + if (amSilent) + //if (!iscarbon(target)) + // user.visible_message("[user] shifts [target] closer to [user.p_their()] mouth.", \ + // "You secretly slip your fangs into [target]'s flesh.", \ + // vision_distance = 2, ignored_mobs=target) // Only people who AREN'T the target will notice this action. + //else + var/deadmessage = target.stat == DEAD ? "" : " [target.p_they(TRUE)] looks dazed, and will not remember this." + user.visible_message("[user] puts [target]'s wrist up to [user.p_their()] mouth.", \ + "You secretly slip your fangs into [target]'s wrist.[deadmessage]", \ + vision_distance = notice_range, ignored_mobs=target) // Only people who AREN'T the target will notice this action. + // Warn Feeder about Witnesses... + var/was_unnoticed = TRUE + for(var/mob/living/M in viewers(notice_range, owner)) + if(M != owner && M != target && iscarbon(M) && M.mind && !M.has_unlimited_silicon_privilege && !M.eye_blind && !M.mind.has_antag_datum(ANTAG_DATUM_BLOODSUCKER)) + was_unnoticed = FALSE + break + if (was_unnoticed) + to_chat(user, "You think no one saw you...") + else + to_chat(user, "Someone may have noticed...") + + else // /atom/proc/visible_message(message, self_message, blind_message, vision_distance, ignored_mobs) + user.visible_message("[user] closes [user.p_their()] mouth around [target]'s neck!", \ + "You sink your fangs into [target]'s neck.") + // My mouth is full! + ADD_TRAIT(user, TRAIT_MUTE, "bloodsucker_feed") + + // Begin Feed Loop + var/warning_target_inhuman = FALSE + var/warning_target_dead = FALSE + var/warning_full = FALSE + var/warning_target_bloodvol = 99999 + var/amount_taken = 0 + var/blood_take_mult = amSilent ? 0.3 : 1 // Quantity to take per tick, based on Silent or not. + var/was_alive = target.stat < DEAD && ishuman(target) + // Activate Effects + //target.add_trait(TRAIT_MUTE, "bloodsucker_victim") // <----- Make mute a power you buy? + + // FEEEEEEEEED!!! // + bloodsuckerdatum.poweron_feed = TRUE + while (bloodsuckerdatum && target && active) + //user.mobility_flags &= ~MOBILITY_MOVE // user.canmove = 0 // Prevents spilling blood accidentally. + + // Abort? A bloody mistake. + if (!do_mob(user, target, 20, 0, 0, extra_checks=CALLBACK(src, .proc/ContinueActive, user, target))) + // May have disabled Feed during do_mob + if (!active || !ContinueActive(user, target)) + break + + if (amSilent) + to_chat(user, "Your feeding has been interrupted...but [target.p_they()] didn't seem to notice you.") + else + to_chat(user, "Your feeding has been interrupted!") + user.visible_message("[user] is ripped from [target]'s throat. [target.p_their(TRUE)] blood sprays everywhere!", \ + "Your teeth are ripped from [target]'s throat. [target.p_their(TRUE)] blood sprays everywhere!") + + // Deal Damage to Target (should have been more careful!) + if (iscarbon(target)) + var/mob/living/carbon/C = target + C.bleed(15) + playsound(get_turf(target), 'sound/effects/splat.ogg', 40, 1) + if (ishuman(target)) + var/mob/living/carbon/human/H = target + H.bleed_rate += 5 + target.add_splatter_floor(get_turf(target)) + user.add_mob_blood(target) // Put target's blood on us. The donor goes in the ( ) + target.add_mob_blood(target) + target.take_overall_damage(10,0) + target.emote("scream") + + // Killed Target? + if (was_alive) + CheckKilledTarget(user,target) + + return + + /////////////////////////////////////////////////////////// + // Handle Feeding! User & Victim Effects (per tick) + bloodsuckerdatum.HandleFeeding(target, blood_take_mult) + amount_taken += amSilent ? 0.3 : 1 + if (!amSilent) + ApplyVictimEffects(target) // Sleep, paralysis, immobile, unconscious, and mute + if (amount_taken > 5 && target.stat < DEAD && ishuman(target)) + SEND_SIGNAL(user, COMSIG_ADD_MOOD_EVENT, "drankblood", /datum/mood_event/drankblood) // GOOD // in bloodsucker_life.dm + + /////////////////////////////////////////////////////////// + // Not Human? + if (!ishuman(target)) + SEND_SIGNAL(user, COMSIG_ADD_MOOD_EVENT, "drankblood", /datum/mood_event/drankblood_bad) // BAD // in bloodsucker_life.dm + if (!warning_target_inhuman) + to_chat(user, "You recoil at the taste of a lesser lifeform.") + warning_target_inhuman = TRUE + // Dead Blood? + if (target.stat >= DEAD) + if (ishuman(target)) + SEND_SIGNAL(user, COMSIG_ADD_MOOD_EVENT, "drankblood", /datum/mood_event/drankblood_dead) // BAD // in bloodsucker_life.dm + if (!warning_target_dead) + to_chat(user, "Your victim is dead. [target.p_their(TRUE)] blood barely nourishes you.") + warning_target_dead = TRUE + // Full? + if (!warning_full && user.blood_volume >= bloodsuckerdatum.maxBloodVolume) + to_chat(user, "You are full. Further blood will be wasted.") + warning_full = TRUE + // Blood Remaining? (Carbons/Humans only) + if (iscarbon(target) && !target.AmBloodsucker(1)) + if (target.blood_volume <= BLOOD_VOLUME_BAD && warning_target_bloodvol > BLOOD_VOLUME_BAD) + to_chat(user, "Your victim's blood volume is fatally low!") + else if (target.blood_volume <= BLOOD_VOLUME_OKAY && warning_target_bloodvol > BLOOD_VOLUME_OKAY) + to_chat(user, "Your victim's blood volume is dangerously low.") + else if (target.blood_volume <= BLOOD_VOLUME_SAFE && warning_target_bloodvol > BLOOD_VOLUME_SAFE) + to_chat(user, "Your victim's blood is at an unsafe level.") + warning_target_bloodvol = target.blood_volume // If we had a warning to give, it's been given by now. + // Done? + if (target.blood_volume <= 0) + to_chat(user, "You have bled your victim dry.") + break + + // Blood Gulp Sound + owner.playsound_local(null, 'sound/effects/singlebeat.ogg', 40, 1) // Play THIS sound for user only. The "null" is where turf would go if a location was needed. Null puts it right in their head. + + // DONE! + //DeactivatePower(user,target) + if (amSilent) + to_chat(user, "You slowly release [target]'s wrist." + (target.stat == 0 ? " [target.p_their(TRUE)] face lacks expression, like you've already been forgotten." : "")) + else + user.visible_message("[user] unclenches their teeth from [target]'s neck.", \ + "You retract your fangs and release [target] from your bite.") + + // /proc/log_combat(atom/user, atom/target, what_done, atom/object=null, addition=null) + log_combat(owner, target, "fed on blood", addition="(and took [amount_taken] blood)") + + // Killed Target? + if (was_alive) + CheckKilledTarget(user,target) + + +/datum/action/bloodsucker/feed/proc/CheckKilledTarget(mob/living/user, mob/living/target) + // Bad Vampire. You shouldn't do that. + if (target && target.stat >= DEAD && ishuman(target)) + SEND_SIGNAL(user, COMSIG_ADD_MOOD_EVENT, "drankkilled", /datum/mood_event/drankkilled) // BAD // in bloodsucker_life.dm + +/datum/action/bloodsucker/feed/ContinueActive(mob/living/user, mob/living/target) + return ..() && target && (!target_grappled || user.pulling == target)// Active, and still Antag, + // NOTE: We only care about pulling if target started off that way. Mostly only important for Aggressive feed. + +/datum/action/bloodsucker/feed/proc/ApplyVictimEffects(mob/living/target) + // Bloodsuckers not affected by "the Kiss" of another vampire + if (!target.mind || !target.mind.has_antag_datum(ANTAG_DATUM_BLOODSUCKER)) + target.Unconscious(50,0) + target.Knockdown(40 + 5 * level_current,1) + // NOTE: THis is based on level of power! + if (ishuman(target)) + target.adjustStaminaLoss(5, forced = TRUE)// Base Stamina Damage + +/datum/action/bloodsucker/feed/DeactivatePower(mob/living/user = owner, mob/living/target) + ..() // activate = FALSE + var/datum/antagonist/bloodsucker/bloodsuckerdatum = user.mind.has_antag_datum(ANTAG_DATUM_BLOODSUCKER) + // No longer Feeding + if (bloodsuckerdatum) + bloodsuckerdatum.poweron_feed = FALSE + feed_target = null + // My mouth is no longer full + REMOVE_TRAIT(owner, TRAIT_MUTE, "bloodsucker_feed") + // Let me move immediately + user.update_canmove() diff --git a/code/modules/antagonists/bloodsucker/powers/bs_fortitude.dm b/code/modules/antagonists/bloodsucker/powers/bs_fortitude.dm new file mode 100644 index 0000000000..3305504c15 --- /dev/null +++ b/code/modules/antagonists/bloodsucker/powers/bs_fortitude.dm @@ -0,0 +1,54 @@ + + + + +/datum/action/bloodsucker/fortitude + name = "Fortitude"//"Cellular Emporium" + desc = "Withstand egregious physical wounds and walk away from attacks that would stun, pierce, and dismember lesser beings. You cannot run while active." + button_icon_state = "power_fortitude" + bloodcost = 5 + cooldown = 80 + bloodsucker_can_buy = TRUE + amToggle = TRUE + warn_constant_cost = TRUE + + var/this_resist // So we can raise and lower your brute resist based on what your level_current WAS. + +/datum/action/bloodsucker/fortitude/ActivatePower() + var/datum/antagonist/bloodsucker/bloodsuckerdatum = owner.mind.has_antag_datum(ANTAG_DATUM_BLOODSUCKER) + var/mob/living/user = owner + to_chat(user, "Your flesh, skin, and muscles become as steel.") + // Traits & Effects + ADD_TRAIT(user, TRAIT_PIERCEIMMUNE, "fortitude") + ADD_TRAIT(user, TRAIT_NODISMEMBER, "fortitude") + ADD_TRAIT(user, TRAIT_STUNIMMUNE, "fortitude") + ADD_TRAIT(user, TRAIT_NORUNNING, "fortitude") + if (ishuman(owner)) + var/mob/living/carbon/human/H = owner + this_resist = max(0.3, 0.7 - level_current * 0.1) + H.physiology.brute_mod *= this_resist//0.5 + H.physiology.burn_mod *= this_resist//0.5 + // Stop Running (Taken from /datum/quirk/nyctophobia in negative.dm) + var/was_running = (user.m_intent == MOVE_INTENT_RUN) + if(was_running) + user.toggle_move_intent() + while(bloodsuckerdatum && ContinueActive(user) || user.m_intent == MOVE_INTENT_RUN) + // Pay Blood Toll (if awake) + if (user.stat == CONSCIOUS) + bloodsuckerdatum.AddBloodVolume(-0.5) // Used to be 0.3 blood per 2 seconds, but we're making it more expensive to keep on. + sleep(20) // Check every few ticks that we haven't disabled this power + // Return to Running (if you were before) + if(was_running && user.m_intent != MOVE_INTENT_RUN) + user.toggle_move_intent() + +/datum/action/bloodsucker/fortitude/DeactivatePower(mob/living/user = owner, mob/living/target) + ..() + // Restore Traits & Effects + REMOVE_TRAIT(user, TRAIT_PIERCEIMMUNE, "fortitude") + REMOVE_TRAIT(user, TRAIT_NODISMEMBER, "fortitude") + REMOVE_TRAIT(user, TRAIT_STUNIMMUNE, "fortitude") + REMOVE_TRAIT(user, TRAIT_NORUNNING, "fortitude") + if (ishuman(owner)) + var/mob/living/carbon/human/H = owner + H.physiology.brute_mod /= this_resist//0.5 + H.physiology.burn_mod /= this_resist//0.5 diff --git a/code/modules/antagonists/bloodsucker/powers/bs_gohome.dm b/code/modules/antagonists/bloodsucker/powers/bs_gohome.dm new file mode 100644 index 0000000000..0da9ab5ba3 --- /dev/null +++ b/code/modules/antagonists/bloodsucker/powers/bs_gohome.dm @@ -0,0 +1,115 @@ + + +/datum/action/bloodsucker/gohome + name = "Vanishing Act" + desc = "As dawn aproaches, disperse into mist and return directly to your Lair.
WARNING: You will drop ALL of your possessions if observed by mortals." + button_icon_state = "power_gohome" + background_icon_state_on = "vamp_power_off_oneshot" // Even though this never goes off. + background_icon_state_off = "vamp_power_off_oneshot" + + bloodcost = 25 + cooldown = 99999 // It'll never come back. + amToggle = FALSE + amSingleUse = TRUE + + bloodsucker_can_buy = FALSE // You only get this if you've claimed a lair, and only just before sunrise. + can_use_in_torpor = TRUE + must_be_capacitated = TRUE + can_be_immobilized = TRUE + +/datum/action/bloodsucker/gohome/CheckCanUse(display_error) + . = ..() + if(!.) + return + // Have No Lair (NOTE: You only got this power if you had a lair, so this means it's destroyed) + var/datum/antagonist/bloodsucker/bloodsuckerdatum = owner.mind.has_antag_datum(ANTAG_DATUM_BLOODSUCKER) + if (!istype(bloodsuckerdatum) || !bloodsuckerdatum.coffin) + if (display_error) + to_chat(owner, "Your coffin has been destroyed!") + return FALSE + return TRUE + +/datum/action/bloodsucker/gohome/ActivatePower() + var/mob/living/carbon/user = owner + var/datum/antagonist/bloodsucker/bloodsuckerdatum = owner.mind.has_antag_datum(ANTAG_DATUM_BLOODSUCKER) + // IMPORTANT: Check for lair at every step! It might get destroyed. + to_chat(user, "You focus on separating your consciousness from your physical form...") + // STEP ONE: Flicker Lights + for(var/obj/machinery/light/L in view(3, get_turf(owner))) // /obj/machinery/light/proc/flicker(var/amount = rand(10, 20)) + L.flicker(5) + playsound(get_turf(owner), 'sound/effects/singlebeat.ogg', 20, 1) + sleep(50) + for(var/obj/machinery/light/L in view(3, get_turf(owner))) // /obj/machinery/light/proc/flicker(var/amount = rand(10, 20)) + L.flicker(5) + playsound(get_turf(owner), 'sound/effects/singlebeat.ogg', 40, 1) + sleep(50) + for(var/obj/machinery/light/L in view(6, get_turf(owner))) // /obj/machinery/light/proc/flicker(var/amount = rand(10, 20)) + L.flicker(5) + playsound(get_turf(owner), 'sound/effects/singlebeat.ogg', 60, 1) + // ( STEP TWO: Lights OFF? ) + // CHECK: Still have Coffin? + if (!istype(bloodsuckerdatum) || !bloodsuckerdatum.coffin) + to_chat(user, "Your coffin has been destroyed! You no longer have a destination.") + return FALSE + if (!owner) + return + // SEEN?: (effects ONLY if there are witnesses! Otherwise you just POOF) + // NOTE: Stolen directly from statue.dm, thanks guys! + var/am_seen = FALSE // Do Effects (seen by anyone) + var/drop_item = FALSE // Drop Stuff (seen by non-vamp) + if (isturf(owner.loc)) // Only check if I'm not in a Locker or something. + // A) Check for Darkness (we can just leave) + var/turf/T = get_turf(user) + if(T && T.lighting_object && T.get_lumcount()>= 0.1) + // B) Check for Viewers + for(var/mob/living/M in viewers(owner)) + if(M != owner && isliving(M) && M.mind && !M.has_unlimited_silicon_privilege && !M.eye_blind) // M.client <--- add this in after testing! + am_seen = TRUE + if (!M.mind.has_antag_datum(ANTAG_DATUM_BLOODSUCKER)) + drop_item = TRUE + break + // LOSE CUFFS + if(user.handcuffed) + var/obj/O = user.handcuffed + user.dropItemToGround(O) + if(user.legcuffed) + var/obj/O = user.legcuffed + user.dropItemToGround(O) + // SEEN! + if (drop_item) + // DROP: Clothes, held items, and cuffs etc + // NOTE: Taken from unequip_everything() in inventory.dm. We need to + // *force* all items to drop, so we had to just gut the code out of it. + var/list/items = list() + items |= user.get_equipped_items() + for(var/I in items) + user.dropItemToGround(I,TRUE) + for(var/obj/item/I in owner.held_items) // drop_all_held_items() + user.dropItemToGround(I, TRUE) + if (am_seen) + // POOF EFFECTS + playsound(get_turf(owner), 'sound/magic/summon_karp.ogg', 60, 1) + var/datum/effect_system/steam_spread/puff = new /datum/effect_system/steam_spread/() + puff.effect_type = /obj/effect/particle_effect/smoke/vampsmoke + puff.set_up(3, 0, get_turf(owner)) + puff.start() + // TELEPORT: Move to Coffin & Close it! + do_teleport(owner, bloodsuckerdatum.coffin, no_effects = TRUE, forced = TRUE, channel = TELEPORT_CHANNEL_QUANTUM) // in teleport.dm? + // SLEEP + user.resting = TRUE + //user.Unconscious(30,0) + user.Stun(30,1) + // CLOSE LID: If fail, force me in. + if (!bloodsuckerdatum.coffin.close(owner)) + bloodsuckerdatum.coffin.insert(owner) // Puts me inside. + // The following was taken from close() proc in closets.dm + // (but we had to do it this way because there is no way to force entry) + playsound(bloodsuckerdatum.coffin.loc, bloodsuckerdatum.coffin.close_sound, 15, 1, -3) + bloodsuckerdatum.coffin.opened = FALSE + bloodsuckerdatum.coffin.density = TRUE + bloodsuckerdatum.coffin.update_icon() + // Lock Coffin + bloodsuckerdatum.coffin.LockMe(owner) + // ( STEP FIVE: Create animal at prev location? ) + //var/mob/living/simple_animal/SA = /mob/living/simple_animal/hostile/retaliate/bat // pick(/mob/living/simple_animal/mouse,/mob/living/simple_animal/mouse,/mob/living/simple_animal/mouse, /mob/living/simple_animal/hostile/retaliate/bat) //prob(300) /mob/living/simple_animal/mouse, + //new SA (owner.loc) diff --git a/code/modules/antagonists/bloodsucker/powers/bs_haste.dm b/code/modules/antagonists/bloodsucker/powers/bs_haste.dm new file mode 100644 index 0000000000..ee1dd3007c --- /dev/null +++ b/code/modules/antagonists/bloodsucker/powers/bs_haste.dm @@ -0,0 +1,85 @@ + +// Level 1: Speed to location +// Level 2: Dodge Bullets +// Level 3: Stun People Passed + +/datum/action/bloodsucker/targeted/haste + name = "Immortal Haste" + desc = "Dash somewhere with supernatural speed. Those nearby may be knocked away, stunned, or left empty-handed." + button_icon_state = "power_speed" + bloodcost = 6 + cooldown = 30 + target_range = 15 + power_activates_immediately = TRUE + message_Trigger = ""//"Whom will you subvert to your will?" + bloodsucker_can_buy = TRUE + must_be_capacitated = TRUE + +/datum/action/bloodsucker/targeted/haste/CheckCanUse(display_error) + . = ..() + if(!.) + return + // Being Grabbed + if(owner.pulledby && owner.pulledby.grab_state >= GRAB_AGGRESSIVE) + if(display_error) + to_chat(owner, "You're being grabbed!") + return FALSE + if(!owner.has_gravity(owner.loc)) //We dont want people to be able to use this to fly around in space + if(display_error) + to_chat(owner, "You cant dash while floating!") + return FALSE + return TRUE + +/datum/action/bloodsucker/targeted/haste/CheckValidTarget(atom/A) + return isturf(A) || A.loc != owner.loc // Anything will do, if it's not me or my square + +/datum/action/bloodsucker/targeted/haste/CheckCanTarget(atom/A, display_error) + // DEFAULT CHECKS (Distance) + if (!..()) + return FALSE + // Check: Range + //if (!(A in view(target_range, get_turf(owner)))) + // return FALSE + return TRUE + +/datum/action/bloodsucker/targeted/haste/FireTargetedPower(atom/A) + // set waitfor = FALSE <---- DONT DO THIS!We WANT this power to hold up ClickWithPower(), so that we can unlock the power when it's done. + var/mob/living/user = owner + var/turf/T = isturf(A) ? A : get_turf(A) + // Pulled? Not anymore. + owner.pulledby = null + // Step One: Heatseek toward Target's Turf + walk_to(owner, T, 0, 0.01, 20) // NOTE: this runs in the background! to cancel it, you need to use walk(owner.current,0), or give them a new path. + playsound(get_turf(owner), 'sound/weapons/punchmiss.ogg', 25, 1, -1) + var/safety = 20 + while(get_turf(owner) != T && safety > 0 && !(isliving(target) && target.Adjacent(owner))) + user.canmove = FALSE //Dont move while doing the thing, or itll break + safety -- + // Did I get knocked down? + if(owner && owner.incapacitated(ignore_restraints=TRUE, ignore_grab=TRUE))// owner.incapacitated()) + // We're gonna cancel. But am I on the ground? Spin me! + if(user.resting) + var/send_dir = get_dir(owner, T) + new /datum/forced_movement(owner, get_ranged_target_turf(owner, send_dir, 1), 1, FALSE) + owner.spin(10) + break + // Spin/Stun people we pass. + //var/mob/living/newtarget = locate(/mob/living) in oview(1, owner) + var/list/mob/living/foundtargets = list() + for(var/mob/living/newtarget in oview(1, owner)) + if (newtarget && newtarget != target && !(newtarget in foundtargets))//!newtarget.IsKnockdown()) + if (rand(0, 5) < level_current) + playsound(get_turf(newtarget), "sound/weapons/punch[rand(1,4)].ogg", 15, 1, -1) + newtarget.Knockdown(10 + level_current * 5) + if(newtarget.IsStun()) + newtarget.spin(10,1) + if (rand(0,4)) + newtarget.drop_all_held_items() + foundtargets += newtarget + sleep(1) + if(user) + user.update_canmove() //Let the poor guy move again + +/datum/action/bloodsucker/targeted/haste/DeactivatePower(mob/living/user = owner, mob/living/target) + ..() // activate = FALSE + user.update_canmove() diff --git a/code/modules/antagonists/bloodsucker/powers/bs_lunge.dm b/code/modules/antagonists/bloodsucker/powers/bs_lunge.dm new file mode 100644 index 0000000000..2c1b8d6321 --- /dev/null +++ b/code/modules/antagonists/bloodsucker/powers/bs_lunge.dm @@ -0,0 +1,83 @@ +// Level 1: Grapple level 2 +// Level 2: Grapple 3 from Behind +// Level 3: Grapple 3 from Shadows +/datum/action/bloodsucker/targeted/lunge + name = "Predatory Lunge" + desc = "Spring at your target and aggressively grapple them without warning. Attacks from concealment or the rear may even knock them down." + button_icon_state = "power_lunge" + bloodcost = 10 + cooldown = 100 + target_range = 3 + power_activates_immediately = TRUE + message_Trigger = ""//"Whom will you subvert to your will?" + must_be_capacitated = TRUE + bloodsucker_can_buy = TRUE + +/datum/action/bloodsucker/targeted/lunge/CheckCanUse(display_error) + if(!..(display_error))// DEFAULT CHECKS + return FALSE + // Being Grabbed + if(owner.pulledby && owner.pulledby.grab_state >= GRAB_AGGRESSIVE) + if(display_error) + to_chat(owner, "You're being grabbed!") + return FALSE + if(!owner.has_gravity(owner.loc))//TODO figure out how to check if theyre able to move while in nograv + if(display_error) + to_chat(owner, "You cant lunge while floating!") + return FALSE + return TRUE + +/datum/action/bloodsucker/targeted/lunge/CheckValidTarget(atom/A) + return isliving(A) + +/datum/action/bloodsucker/targeted/lunge/CheckCanTarget(atom/A, display_error) + // Check: Self + if(target == owner) + return FALSE + // Check: Range + //if (!(target in view(target_range, get_turf(owner)))) + // if (display_error) + // to_chat(owner, "Your victim is too far away.") + // return FALSE + // DEFAULT CHECKS (Distance) + if(!..()) + return FALSE + // Check: Turf + var/mob/living/L = A + if(!isturf(L.loc)) + return FALSE + return TRUE + +/datum/action/bloodsucker/targeted/lunge/FireTargetedPower(atom/A) + // set waitfor = FALSE <---- DONT DO THIS!We WANT this power to hold up ClickWithPower(), so that we can unlock the power when it's done. + var/mob/living/carbon/target = A + var/turf/T = get_turf(target) + // Clear Vars + owner.pulling = null + // Will we Knock them Down? + var/do_knockdown = !is_A_facing_B(target,owner) || owner.alpha <= 0 || istype(owner.loc, /obj/structure/closet) + // CAUSES: Target has their back to me, I'm invisible, or I'm in a Closet + // Step One: Heatseek toward Target's Turf + + walk_towards(owner, T, 0.1, 10) // NOTE: this runs in the background! to cancel it, you need to use walk(owner.current,0), or give them a new path. + addtimer(CALLBACK(owner, .proc/_walk, 0), 2 SECONDS) + if(get_turf(owner) != T && !(isliving(target) && target.Adjacent(owner)) && owner.incapacitated() && owner.resting) + var/send_dir = get_dir(owner, T) + new /datum/forced_movement(owner, get_ranged_target_turf(owner, send_dir, 1), 1, FALSE) + owner.spin(10) + // Step Two: Check if I'm at/adjectent to Target's CURRENT turf (not original...that was just a destination) + sleep(1) + if(target.Adjacent(owner)) + // LEVEL 2: If behind target, mute or unconscious! + if(do_knockdown) // && level_current >= 1) + target.Knockdown(15 + 10 * level_current,1) + target.adjustStaminaLoss(40 + 10 * level_current) + // Cancel Walk (we were close enough to contact them) + walk(owner, 0) + target.Stun(10,1) //Without this the victim can just walk away + target.grabbedby(owner) // Taken from mutations.dm under changelings + target.grippedby(owner, instant = TRUE) //instant aggro grab + +/datum/action/bloodsucker/targeted/lunge/DeactivatePower(mob/living/user = owner, mob/living/target) + ..() // activate = FALSE + user.update_canmove() diff --git a/code/modules/antagonists/bloodsucker/powers/bs_masquerade.dm b/code/modules/antagonists/bloodsucker/powers/bs_masquerade.dm new file mode 100644 index 0000000000..6ee17b3014 --- /dev/null +++ b/code/modules/antagonists/bloodsucker/powers/bs_masquerade.dm @@ -0,0 +1,97 @@ + + + +// WITHOUT THIS POWER: +// +// - Mid-Blood: SHOW AS PALE +// - Low-Blood: SHOW AS DEAD +// - No Heartbeat +// - Examine shows actual blood +// - Thermal homeostasis (ColdBlooded) + + + +// WITH THIS POWER: +// - Normal body temp -- remove Cold Blooded (return on deactivate) +// - + + +/datum/action/bloodsucker/masquerade + name = "Masquerade" + desc = "Feign the vital signs of a mortal, and escape both casual and medical notice as the monster you truly are." + button_icon_state = "power_human" + bloodcost = 10 + cooldown = 50 + amToggle = TRUE + bloodsucker_can_buy = TRUE + warn_constant_cost = TRUE + can_use_in_torpor = TRUE // Masquerade is maybe the only one that can do this. It stops your healing. + cooldown_static = TRUE + +// NOTE: Firing off vulgar powers disables your Masquerade! + +/*/datum/action/bloodsucker/masquerade/CheckCanUse(display_error) + if(!..(display_error))// DEFAULT CHECKS + return FALSE + // DONE! + return TRUE +*/ + + +/datum/action/bloodsucker/masquerade/ActivatePower() + + var/mob/living/user = owner + var/datum/antagonist/bloodsucker/bloodsuckerdatum = user.mind.has_antag_datum(ANTAG_DATUM_BLOODSUCKER) + + to_chat(user, "Your heart beats falsely within your lifeless chest. You may yet pass for a mortal.") + to_chat(user, "Your vampiric healing is halted while imitating life.") + + + // Remove ColdBlooded & Hard/SoftCrit + REMOVE_TRAIT(user, TRAIT_COLDBLOODED, "bloodsucker") + REMOVE_TRAIT(user, TRAIT_NOHARDCRIT, "bloodsucker") + REMOVE_TRAIT(user, TRAIT_NOSOFTCRIT, "bloodsucker") + var/obj/item/organ/heart/vampheart/H = user.getorganslot(ORGAN_SLOT_HEART) + + // WE ARE ALIVE! // + bloodsuckerdatum.poweron_masquerade = TRUE + while(bloodsuckerdatum && ContinueActive(user)) + + // HEART + if (istype(H)) + H.FakeStart() + + // PASSIVE (done from LIFE) + // Don't Show Pale/Dead on low blood + // Don't vomit food + // Don't Heal + + // Pay Blood Toll (if awake) + if (user.stat == CONSCIOUS) + bloodsuckerdatum.AddBloodVolume(-0.2) + + sleep(20) // Check every few ticks that we haven't disabled this power + + +/datum/action/bloodsucker/masquerade/ContinueActive(mob/living/user) + // Disable if unable to use power anymore. + //if (user.stat == DEAD || user.blood_volume <= 0) // not conscious or soft critor uncon, just dead + // return FALSE + return ..() // Active, and still Antag + + +/datum/action/bloodsucker/masquerade/DeactivatePower(mob/living/user = owner, mob/living/target) + ..() // activate = FALSE + + var/datum/antagonist/bloodsucker/bloodsuckerdatum = user.mind.has_antag_datum(ANTAG_DATUM_BLOODSUCKER) + bloodsuckerdatum.poweron_masquerade = FALSE + + ADD_TRAIT(user, TRAIT_COLDBLOODED, "bloodsucker") + ADD_TRAIT(user, TRAIT_NOHARDCRIT, "bloodsucker") + ADD_TRAIT(user, TRAIT_NOSOFTCRIT, "bloodsucker") + + // HEART + var/obj/item/organ/heart/H = user.getorganslot(ORGAN_SLOT_HEART) + H.Stop() + + to_chat(user, "Your heart beats one final time, while your skin dries out and your icy pallor returns.") diff --git a/code/modules/antagonists/bloodsucker/powers/bs_mesmerize.dm b/code/modules/antagonists/bloodsucker/powers/bs_mesmerize.dm new file mode 100644 index 0000000000..94bc0e11d0 --- /dev/null +++ b/code/modules/antagonists/bloodsucker/powers/bs_mesmerize.dm @@ -0,0 +1,114 @@ + +// * MEZMERIZE +// LOVE: Target falls in love with you. Being harmed directly causes them harm if they see it? +// STAY: Target will do everything they can to stand in the same place. +// FOLLOW: Target follows you, spouting random phrases from their history (or maybe Poly's or NPC's vocab?) +// ATTACK: Target finds a nearby non-Bloodsucker victim to attack. + +/datum/action/bloodsucker/targeted/mesmerize + name = "Mesmerize" + desc = "Dominate the mind of a mortal who can see your eyes." + button_icon_state = "power_mez" + bloodcost = 30 + cooldown = 200 + target_range = 1 + power_activates_immediately = FALSE + message_Trigger = "Whom will you subvert to your will?" + must_be_capacitated = TRUE + bloodsucker_can_buy = TRUE + +/datum/action/bloodsucker/targeted/mesmerize/CheckCanUse(display_error) + . = ..() + if(!.) + return + if (!owner.getorganslot(ORGAN_SLOT_EYES)) + if (display_error) + to_chat(owner, "You have no eyes with which to mesmerize.") + return FALSE + // Check: Eyes covered? + var/mob/living/L = owner + if (istype(L) && L.is_eyes_covered() || !isturf(owner.loc)) + if (display_error) + to_chat(owner, "Your eyes are concealed from sight.") + return FALSE + return TRUE + +/datum/action/bloodsucker/targeted/mesmerize/CheckValidTarget(atom/A) + return iscarbon(A) + +/datum/action/bloodsucker/targeted/mesmerize/CheckCanTarget(atom/A,display_error) + // Check: Self + if (A == owner) + return FALSE + var/mob/living/carbon/target = A // We already know it's carbon due to CheckValidTarget() + // Bloodsucker + if (target.mind && target.mind.has_antag_datum(ANTAG_DATUM_BLOODSUCKER)) + if (display_error) + to_chat(owner, "Bloodsuckers are immune to [src].") + return FALSE + // Dead/Unconscious + if (target.stat > CONSCIOUS) + if (display_error) + to_chat(owner, "Your victim is not [(target.stat == DEAD || HAS_TRAIT(target, TRAIT_FAKEDEATH))?"alive":"conscious"].") + return FALSE + // Check: Target has eyes? + if (!target.getorganslot(ORGAN_SLOT_EYES)) + if (display_error) + to_chat(owner, "They have no eyes!") + return FALSE + // Check: Target blind? + if (target.eye_blind > 0) + if (display_error) + to_chat(owner, "Your victim's eyes are glazed over. They cannot perceive you.") + return FALSE + // Check: Target See Me? (behind wall) + if (!(owner in view(target_range, get_turf(target)))) + // Sub-Check: GET CLOSER + //if (!(owner in range(target_range, get_turf(target))) + // if (display_error) + // to_chat(owner, "You're too far from your victim.") + if (display_error) + to_chat(owner, "You're too far outside your victim's view.") + return FALSE + // Check: Facing target? + if (!is_A_facing_B(owner,target)) // in unsorted.dm + if (display_error) + to_chat(owner, "You must be facing your victim.") + return FALSE + // Check: Target facing me? + if (!target.resting && !is_A_facing_B(target,owner)) + if (display_error) + to_chat(owner, "Your victim must be facing you to see into your eyes.") + return FALSE + return TRUE + +/datum/action/bloodsucker/targeted/mesmerize/FireTargetedPower(atom/A) + // set waitfor = FALSE <---- DONT DO THIS!We WANT this power to hold up ClickWithPower(), so that we can unlock the power when it's done. + var/mob/living/carbon/target = A + var/mob/living/user = owner + + if(istype(target)) + target.Stun(40) //Utterly useless without this, its okay since there are so many checks to go through + target.silent = 45 //Shhhh little lamb + target.apply_status_effect(STATUS_EFFECT_MESMERIZE, 45) //So you cant rotate with combat mode, plus fancy status alert + + if(do_mob(user, target, 40, 0, TRUE, extra_checks=CALLBACK(src, .proc/ContinueActive, user, target))) + PowerActivatedSuccessfully() // PAY COST! BEGIN COOLDOWN! + var/power_time = 90 + level_current * 12 + target.silent = power_time + 20 + target.apply_status_effect(STATUS_EFFECT_MESMERIZE, 100 + level_current * 15) + to_chat(user, "[target] is fixed in place by your hypnotic gaze.") + target.Stun(power_time) + //target.silent += power_time / 10 // Silent isn't based on ticks. + target.next_move = world.time + power_time // <--- Use direct change instead. We want an unmodified delay to their next move // target.changeNext_move(power_time) // check click.dm + target.notransform = TRUE // <--- Fuck it. We tried using next_move, but they could STILL resist. We're just doing a hard freeze. + spawn(power_time) + if(istype(target)) + target.notransform = FALSE + // They Woke Up! (Notice if within view) + if(istype(user) && target.stat == CONSCIOUS && (target in view(10, get_turf(user))) ) + to_chat(user, "[target] has snapped out of their trance.") + + +/datum/action/bloodsucker/targeted/mesmerize/ContinueActive(mob/living/user, mob/living/target) + return ..() && CheckCanUse() && CheckCanTarget(target) diff --git a/code/modules/antagonists/bloodsucker/powers/bs_trespass.dm b/code/modules/antagonists/bloodsucker/powers/bs_trespass.dm new file mode 100644 index 0000000000..c650a6af15 --- /dev/null +++ b/code/modules/antagonists/bloodsucker/powers/bs_trespass.dm @@ -0,0 +1,124 @@ + + +/datum/action/bloodsucker/targeted/trespass + name = "Trespass" + desc = "Become mist and advance two tiles in one direction, ignoring all obstacles except for walls. Useful for skipping past doors and barricades." + button_icon_state = "power_tres" + + bloodcost = 10 + cooldown = 60 + amToggle = FALSE + //target_range = 2 + + bloodsucker_can_buy = TRUE + must_be_capacitated = FALSE + can_be_immobilized = TRUE + + var/turf/target_turf // We need to decide where we're going based on where we clicked. It's not actually the tile we clicked. + +/datum/action/bloodsucker/targeted/trespass/CheckCanUse(display_error) + . = ..() + if(!.) + return + if(owner.notransform || !get_turf(owner)) + return FALSE + + return TRUE + + +/datum/action/bloodsucker/targeted/trespass/CheckValidTarget(atom/A) + // Can't target my tile + if (A == get_turf(owner) || get_turf(A) == get_turf(owner)) + return FALSE + + return TRUE // All we care about is destination. Anything you click is fine. + + +/datum/action/bloodsucker/targeted/trespass/CheckCanTarget(atom/A, display_error) + // NOTE: Do NOT use ..()! We don't want to check distance or anything. + + // Get clicked tile + var/final_turf = isturf(A) ? A : get_turf(A) + + // Are either tiles WALLS? + var/turf/from_turf = get_turf(owner) + var/this_dir // = get_dir(from_turf, target_turf) + for (var/i=1 to 2) + // Keep Prev Direction if we've reached final turf + if (from_turf != final_turf) + this_dir = get_dir(from_turf, final_turf) // Recalculate dir so we don't overshoot on a diagonal. + from_turf = get_step(from_turf, this_dir) + // ERROR! Wall! + if (iswallturf(from_turf)) + if (display_error) + var/wallwarning = (i == 1) ? "in the way" : "at your destination" + to_chat(owner, "There is a solid wall [wallwarning].") + return FALSE + // Done + target_turf = from_turf + + return TRUE + + +/datum/action/bloodsucker/targeted/trespass/FireTargetedPower(atom/A) + // set waitfor = FALSE <---- DONT DO THIS!We WANT this power to hold up ClickWithPower(), so that we can unlock the power when it's done. + + // Find target turf, at or below Atom + var/mob/living/carbon/user = owner + var/turf/my_turf = get_turf(owner) + + user.visible_message("[user]'s form dissipates into a cloud of mist!", \ + "You disspiate into formless mist.") + + + // Effect Origin + playsound(get_turf(owner), 'sound/magic/summon_karp.ogg', 60, 1) + var/datum/effect_system/steam_spread/puff = new /datum/effect_system/steam_spread/() + puff.effect_type = /obj/effect/particle_effect/smoke/vampsmoke + puff.set_up(3, 0, my_turf) + puff.start() + + var/mist_delay = max(5, 20 - level_current * 2.5) // Level up and do this faster. + + // Freeze Me + user.next_move = world.time + mist_delay + user.Stun(mist_delay, ignore_canstun = TRUE) + user.notransform = TRUE + user.density = 0 + var/invis_was = user.invisibility + user.invisibility = INVISIBILITY_MAXIMUM + + // LOSE CUFFS + if(user.handcuffed) + var/obj/O = user.handcuffed + user.dropItemToGround(O) + if(user.legcuffed) + var/obj/O = user.legcuffed + user.dropItemToGround(O) + + // Wait... + sleep(mist_delay / 2) + + // Move & Freeze + if (isturf(target_turf)) + do_teleport(owner, target_turf, no_effects=TRUE, channel = TELEPORT_CHANNEL_QUANTUM) // in teleport.dm? + user.next_move = world.time + mist_delay / 2 + user.Stun(mist_delay / 2, ignore_canstun = TRUE) + + // Wait... + sleep(mist_delay / 2) + + // Un-Hide & Freeze + user.dir = get_dir(my_turf, target_turf) + user.next_move = world.time + mist_delay / 2 + user.Stun(mist_delay / 2, ignore_canstun = TRUE) + user.notransform = FALSE + user.density = 1 + user.invisibility = invis_was + + // Effect Destination + playsound(get_turf(owner), 'sound/magic/summon_karp.ogg', 60, 1) + puff = new /datum/effect_system/steam_spread/() + puff.effect_type = /obj/effect/particle_effect/smoke/vampsmoke + puff.set_up(3, 0, target_turf) + puff.start() diff --git a/code/modules/antagonists/bloodsucker/powers/bs_veil.dm b/code/modules/antagonists/bloodsucker/powers/bs_veil.dm new file mode 100644 index 0000000000..0c83cc2d44 --- /dev/null +++ b/code/modules/antagonists/bloodsucker/powers/bs_veil.dm @@ -0,0 +1,163 @@ + +/datum/action/bloodsucker/veil + name = "Veil of Many Faces" + desc = "Disguise yourself in the illusion of another identity." + button_icon_state = "power_veil" + bloodcost = 15 + cooldown = 100 + amToggle = TRUE + bloodsucker_can_buy = TRUE + warn_constant_cost = TRUE + + // Outfit Vars + var/list/original_items = list() + + // Identity Vars + var/prev_gender + var/prev_skin_tone + var/prev_hair_style + var/prev_facial_hair_style + var/prev_hair_color + var/prev_facial_hair_color + var/prev_underwear + var/prev_undie_color + var/prev_undershirt + var/prev_shirt_color + var/prev_socks + var/prev_socks_color + var/prev_disfigured + var/list/prev_features // For lizards and such + + +/datum/action/bloodsucker/veil/CheckCanUse(display_error) + . = ..() + if(!.) + return + + return TRUE + + +/datum/action/bloodsucker/veil/ActivatePower() + + cast_effect() // POOF + + //if (blahblahblah) + // Disguise_Outfit() + + Disguise_FaceName() + + +/datum/action/bloodsucker/veil/proc/Disguise_Outfit() + + // Step One: Back up original items + + + + +/datum/action/bloodsucker/veil/proc/Disguise_FaceName() + + // Change Name/Voice + var/mob/living/carbon/human/H = owner + H.name_override = H.dna.species.random_name(H.gender) + H.name = H.name_override + H.SetSpecialVoice(H.name_override) + to_chat(owner, "You mystify the air around your person. Your identity is now altered.") + + // Store Prev Appearance + prev_gender = H.gender + prev_skin_tone = H.skin_tone + prev_hair_style = H.hair_style + prev_facial_hair_style = H.facial_hair_style + prev_hair_color = H.hair_color + prev_facial_hair_color = H.facial_hair_color + prev_underwear = H.underwear + prev_undie_color = H.undie_color + prev_undershirt = H.undershirt + prev_shirt_color = H.shirt_color + prev_socks = H.socks + prev_socks_color = H.socks_color + //prev_eye_color + prev_disfigured = HAS_TRAIT(H, TRAIT_DISFIGURED) // I was disfigured! //prev_disabilities = H.disabilities + prev_features = H.dna.features + + // Change Appearance, not randomizing clothes colour, itll just be janky + H.gender = pick(MALE, FEMALE) + H.skin_tone = random_skin_tone() + H.hair_style = random_hair_style(H.gender) + H.facial_hair_style = pick(random_facial_hair_style(H.gender),"Shaved") + H.hair_color = random_short_color() + H.facial_hair_color = H.hair_color + H.underwear = random_underwear(H.gender) + H.undershirt = random_undershirt(H.gender) + H.socks = random_socks(H.gender) + //H.eye_color = random_eye_color() + REMOVE_TRAIT(H, TRAIT_DISFIGURED, null) // + H.dna.features = random_features() + + // Apply Appearance + H.update_body() // Outfit and underware, also body. + //H.update_mutant_bodyparts() // Lizard tails etc + H.update_hair() + H.update_body_parts() + + // Wait here til we deactivate power or go unconscious + var/datum/antagonist/bloodsucker/bloodsuckerdatum = owner.mind.has_antag_datum(ANTAG_DATUM_BLOODSUCKER) + while (ContinueActive(owner) && istype(bloodsuckerdatum))//active && owner && owner.stat == CONSCIOUS) + bloodsuckerdatum.AddBloodVolume(-0.2) + sleep(10) + + // Wait for a moment if you fell unconscious... + if (owner && owner.stat > CONSCIOUS) + sleep(50) + + +/datum/action/bloodsucker/veil/DeactivatePower(mob/living/user = owner, mob/living/target) + ..() + if (ishuman(user)) + var/mob/living/carbon/human/H = user + + // Revert Identity + H.UnsetSpecialVoice() + H.name_override = null + H.name = H.real_name + + // Revert Appearance + H.gender = prev_gender + H.skin_tone = prev_skin_tone + H.hair_style = prev_hair_style + H.facial_hair_style = prev_facial_hair_style + H.hair_color = prev_hair_color + H.facial_hair_color = prev_facial_hair_color + H.underwear = prev_underwear + H.undie_color = prev_undie_color + H.undershirt = prev_undershirt + H.shirt_color = prev_shirt_color + H.socks = prev_socks + H.socks_color = prev_socks_color + + //H.disabilities = prev_disabilities // Restore HUSK, CLUMSY, etc. + if (prev_disfigured) + ADD_TRAIT(H, TRAIT_DISFIGURED, "husk") // NOTE: We are ASSUMING husk. // H.status_flags |= DISFIGURED // Restore "Unknown" disfigurement + H.dna.features = prev_features + // Apply Appearance + H.update_body() // Outfit and underware, also body. + H.update_hair() + H.update_body_parts() // Body itself, maybe skin color? + cast_effect() // POOF + + // CAST EFFECT // // General effect (poof, splat, etc) when you cast. Doesn't happen automatically! +/datum/action/bloodsucker/veil/proc/cast_effect() + // Effect + playsound(get_turf(owner), 'sound/magic/smoke.ogg', 20, 1) + var/datum/effect_system/steam_spread/puff = new /datum/effect_system/steam_spread/() + puff.effect_type = /obj/effect/particle_effect/smoke/vampsmoke + puff.set_up(3, 0, get_turf(owner)) + puff.attach(owner) // OPTIONAL + puff.start() + owner.spin(8, 1) // Spin around like a loon. + +/obj/effect/particle_effect/smoke/vampsmoke + opaque = FALSE + lifetime = 0 +/obj/effect/particle_effect/smoke/vampsmoke/fade_out(frames = 6) + ..(frames) diff --git a/code/modules/antagonists/bloodsucker/powers/v_recuperate.dm b/code/modules/antagonists/bloodsucker/powers/v_recuperate.dm new file mode 100644 index 0000000000..6b8795ea02 --- /dev/null +++ b/code/modules/antagonists/bloodsucker/powers/v_recuperate.dm @@ -0,0 +1,38 @@ +/datum/action/bloodsucker/vassal/recuperate + name = "Sanguine Recuperation" + desc = "Slowly heal brute damage while active. This process is exhausting, and requires some of your tainted blood." + button_icon_state = "power_recup" + amToggle = TRUE + bloodcost = 5 + cooldown = 100 + +/datum/action/bloodsucker/vassal/recuperate/CheckCanUse(display_error) + . = ..() + if(!.) + return + if (owner.stat >= DEAD) + return FALSE + return TRUE + +/datum/action/bloodsucker/vassal/recuperate/ActivatePower() + to_chat(owner, "Your muscles clench and your skin crawls as your master's immortal blood knits your wounds and gives you stamina.") + var/mob/living/carbon/C = owner + var/mob/living/carbon/human/H + if(ishuman(owner)) + H = owner + while(ContinueActive(owner)) + C.adjustBruteLoss(-1.5) + C.adjustFireLoss(-0.5) + C.adjustToxLoss(-2, forced = TRUE) + C.blood_volume -= 0.2 + C.adjustStaminaLoss(-15) + // Stop Bleeding + if(istype(H) && H.bleed_rate > 0 && rand(20) == 0) + H.bleed_rate -- + C.Jitter(5) + sleep(10) + // DONE! + //DeactivatePower(owner) + +/datum/action/bloodsucker/vassal/recuperate/ContinueActive(mob/living/user, mob/living/target) + return ..() && user.stat <= DEAD && user.blood_volume > 500 diff --git a/code/modules/antagonists/changeling/powers/headcrab.dm b/code/modules/antagonists/changeling/powers/headcrab.dm index 72d8a127ab..1e06fb39de 100644 --- a/code/modules/antagonists/changeling/powers/headcrab.dm +++ b/code/modules/antagonists/changeling/powers/headcrab.dm @@ -25,7 +25,8 @@ to_chat(H, "You are blinded by a shower of blood!") H.Stun(20) H.blur_eyes(20) - H.adjust_eye_damage(5) + var/obj/item/organ/eyes/eyes = H.getorganslot(ORGAN_SLOT_EYES) + eyes?.applyOrganDamage(5) H.confused += 3 for(var/mob/living/silicon/S in range(2,user)) to_chat(S, "Your sensors are disabled by a shower of blood!") diff --git a/code/modules/antagonists/clockcult/clock_effects/clock_sigils.dm b/code/modules/antagonists/clockcult/clock_effects/clock_sigils.dm index 0125dc7cf5..a27f911163 100644 --- a/code/modules/antagonists/clockcult/clock_effects/clock_sigils.dm +++ b/code/modules/antagonists/clockcult/clock_effects/clock_sigils.dm @@ -77,13 +77,16 @@ for(var/mob/living/M in viewers(5, src)) if(!is_servant_of_ratvar(M) && M != L) M.flash_act() - if(iscultist(L)) + if(iscultist(L)) //No longer stuns cultists, instead sets them on fire and burns them to_chat(L, "\"Watch your step, wretch.\"") - L.adjustBruteLoss(10) - L.Knockdown(80, FALSE) + L.adjustFireLoss(10) + L.Knockdown(20, FALSE) + L.adjust_fire_stacks(5) //Burn! + L.IgniteMob() + else + L.Stun(40) L.visible_message("[src] appears around [L] in a burst of light!", \ - "[target_flashed ? "An unseen force":"The glowing sigil around you"] holds you in place!") - L.Stun(40) + "[target_flashed ? "An unseen force":"The glowing sigil around you"] [iscultist(L) ? "painfully bursts into flames!" : "holds you in place!"]") L.apply_status_effect(STATUS_EFFECT_BELLIGERENT) new /obj/effect/temp_visual/ratvar/sigil/transgression(get_turf(src)) qdel(src) diff --git a/code/modules/antagonists/clockcult/clock_helpers/slab_abilities.dm b/code/modules/antagonists/clockcult/clock_helpers/slab_abilities.dm index 23caa788d4..1f616b7dbc 100644 --- a/code/modules/antagonists/clockcult/clock_helpers/slab_abilities.dm +++ b/code/modules/antagonists/clockcult/clock_helpers/slab_abilities.dm @@ -193,15 +193,26 @@ L.visible_message("[L]'s eyes flare with dim light!") playsound(L, 'sound/weapons/sear.ogg', 50, TRUE) else - L.visible_message("[L]'s eyes blaze with brilliant light!", \ - "Your vision suddenly screams with white-hot light!") - L.Knockdown(15, TRUE, FALSE, 15) - L.apply_status_effect(STATUS_EFFECT_KINDLE) - L.flash_act(1, 1) - if(issilicon(target)) - var/mob/living/silicon/S = L - S.emp_act(EMP_HEAVY) - if(iscultist(L)) + if(!iscultist(L)) + L.visible_message("[L]'s eyes blaze with brilliant light!", \ + "Your vision suddenly screams with white-hot light!") + L.Knockdown(15, TRUE, FALSE, 15) + L.apply_status_effect(STATUS_EFFECT_KINDLE) + L.flash_act(1, 1) + if(issilicon(target)) + var/mob/living/silicon/S = L + S.emp_act(EMP_HEAVY) + else //for Nar'sian weaklings + to_chat(L, "\"How does it feel to see the light, dog?\"") + L.visible_message("[L]'s eyes flare with burning light!", \ + "Your vision suddenly screams with a flash of burning hot light!") //Debuffs Narsian cultists hard + deals some burn instead of just hardstunning them; Only the confusion part can stack + L.flash_act(1,1) + if(iscarbon(target)) + var/mob/living/carbon/C = L + C.stuttering = max(8, C.stuttering) + C.drowsyness = max(8, C.drowsyness) + C.confused += CLAMP(16 - C.confused, 0, 8) + C.apply_status_effect(STATUS_EFFECT_BELLIGERENT) L.adjustFireLoss(15) ..() diff --git a/code/modules/antagonists/clockcult/clock_items/clock_weapons/ratvarian_spear.dm b/code/modules/antagonists/clockcult/clock_items/clock_weapons/ratvarian_spear.dm index a7fcf0a3b0..7534f7c043 100644 --- a/code/modules/antagonists/clockcult/clock_items/clock_weapons/ratvarian_spear.dm +++ b/code/modules/antagonists/clockcult/clock_items/clock_weapons/ratvarian_spear.dm @@ -56,8 +56,14 @@ L.visible_message("[src] bounces off of [L], as if repelled by an unseen force!") else if(!..()) if(!L.anti_magic_check()) - if(issilicon(L) || iscultist(L)) + if(issilicon(L)) L.Knockdown(100) + else if(iscultist(L)) + L.confused += CLAMP(10 - L.confused, 0, 5) // Spearthrow now confuses enemy cultists + just deals extra damage / sets on fire instead of hardstunning + damage + to_chat(L, "[src] crashes into you with burning force, sending you reeling!") + L.adjust_fire_stacks(2) + L.Knockdown(1) + L.IgniteMob() else L.Knockdown(40) GLOB.clockwork_vitality += L.adjustFireLoss(bonus_burn * 3) //normally a total of 40 damage, 70 with ratvar diff --git a/code/modules/antagonists/clockcult/clock_items/clockwork_slab.dm b/code/modules/antagonists/clockcult/clock_items/clockwork_slab.dm index 58835e0cd4..d4d5349c70 100644 --- a/code/modules/antagonists/clockcult/clock_items/clockwork_slab.dm +++ b/code/modules/antagonists/clockcult/clock_items/clockwork_slab.dm @@ -162,9 +162,11 @@ access_display(user) /obj/item/clockwork/slab/AltClick(mob/living/user) + . = ..() if(is_servant_of_ratvar(user) && linking && user.canUseTopic(src, BE_CLOSE, ismonkey(user))) linking = null to_chat(user, "Object link canceled.") + return TRUE /obj/item/clockwork/slab/proc/access_display(mob/living/user) if(!is_servant_of_ratvar(user)) diff --git a/code/modules/antagonists/clockcult/clock_items/wraith_spectacles.dm b/code/modules/antagonists/clockcult/clock_items/wraith_spectacles.dm index 9d241148b4..2a916c7a2f 100644 --- a/code/modules/antagonists/clockcult/clock_items/wraith_spectacles.dm +++ b/code/modules/antagonists/clockcult/clock_items/wraith_spectacles.dm @@ -48,10 +48,11 @@ /obj/item/clothing/glasses/wraith_spectacles/proc/blind_cultist(mob/living/victim) if(iscultist(victim)) + var/obj/item/organ/eyes/eyes = victim.getorganslot(ORGAN_SLOT_EYES) to_chat(victim, "\"It looks like Nar'Sie's dogs really don't value their eyes.\"") to_chat(victim, "Your eyes explode with horrific pain!") victim.emote("scream") - victim.become_blind(EYE_DAMAGE) + eyes?.applyOrganDamage(eyes.maxHealth) victim.adjust_blurriness(30) victim.adjust_blindness(30) return TRUE @@ -141,21 +142,23 @@ if(glasses_right && !WS.up && !GLOB.ratvar_awakens && !GLOB.ratvar_approaches) apply_eye_damage(H) else + var/obj/item/organ/eyes/eyes = H.getorganslot(ORGAN_SLOT_EYES) if(GLOB.ratvar_awakens) H.cure_nearsighted(list(EYE_DAMAGE)) H.cure_blind(list(EYE_DAMAGE)) - H.adjust_eye_damage(-eye_damage_done) + eyes?.applyOrganDamage(-eye_damage_done) eye_damage_done = 0 else if(prob(50) && eye_damage_done) - H.adjust_eye_damage(-1) + eyes?.applyOrganDamage(-1) eye_damage_done = max(0, eye_damage_done - 1) if(!eye_damage_done) qdel(src) /datum/status_effect/wraith_spectacles/proc/apply_eye_damage(mob/living/carbon/human/H) - if(HAS_TRAIT(H, TRAIT_BLIND)) + var/obj/item/organ/eyes/eyes = H.getorganslot(ORGAN_SLOT_EYES) + if(HAS_TRAIT(H, TRAIT_BLIND) || !eyes) return - H.adjust_eye_damage(0.5) + eyes.applyOrganDamage(0.5) eye_damage_done += 0.5 if(eye_damage_done >= 20) H.adjust_blurriness(2) @@ -166,7 +169,7 @@ if(eye_damage_done >= blind_breakpoint) if(!HAS_TRAIT(H, TRAIT_BLIND)) to_chat(H, "A piercing white light floods your vision. Suddenly, all goes dark!") - H.become_blind(EYE_DAMAGE) + eyes.applyOrganDamage(eyes.maxHealth) if(prob(min(20, 5 + eye_damage_done))) to_chat(H, "Your eyes continue to burn.") diff --git a/code/modules/antagonists/clockcult/clock_mobs/_eminence.dm b/code/modules/antagonists/clockcult/clock_mobs/_eminence.dm index 47faea6dc8..86099d8c79 100644 --- a/code/modules/antagonists/clockcult/clock_mobs/_eminence.dm +++ b/code/modules/antagonists/clockcult/clock_mobs/_eminence.dm @@ -98,7 +98,7 @@ else to_chat(M, message) -/mob/camera/eminence/Hear(message, atom/movable/speaker, datum/language/message_language, raw_message, radio_freq, list/spans, message_mode) +/mob/camera/eminence/Hear(message, atom/movable/speaker, datum/language/message_language, raw_message, radio_freq, list/spans, message_mode, atom/movable/source) . = ..() if(is_reebe(z) || is_servant_of_ratvar(speaker) || GLOB.ratvar_approaches || GLOB.ratvar_awakens) //Away from Reebe, the Eminence can't hear anything to_chat(src, message) diff --git a/code/modules/antagonists/clockcult/clock_mobs/clockwork_marauder.dm b/code/modules/antagonists/clockcult/clock_mobs/clockwork_marauder.dm index 42ca9e07e2..311f552467 100644 --- a/code/modules/antagonists/clockcult/clock_mobs/clockwork_marauder.dm +++ b/code/modules/antagonists/clockcult/clock_mobs/clockwork_marauder.dm @@ -1,5 +1,7 @@ #define MARAUDER_SLOWDOWN_PERCENTAGE 0.40 //Below this percentage of health, marauders will become slower #define MARAUDER_SHIELD_REGEN_TIME 200 //In deciseconds, how long it takes for shields to regenerate after breaking +#define MARAUDER_SPACE_FULL_DAMAGE 6 //amount of damage per life tick while inside space +#define MARAUDER_SPACE_NEAR_DAMAGE 4 //amount of damage taking per Life() tick from being next to space. //Clockwork marauder: A well-rounded frontline construct. Only one can exist for every two human servants. /mob/living/simple_animal/hostile/clockwork/marauder @@ -20,12 +22,14 @@ movement_type = FLYING a_intent = INTENT_HARM loot = list(/obj/item/clockwork/component/geis_capacitor/fallen_armor) - light_range = 2 - light_power = 1.1 + light_range = 3 + light_power = 1.7 playstyle_string = "You are a clockwork marauder, a well-rounded frontline construct of Ratvar. Although you have no \ unique abilities, you're a fearsome fighter in one-on-one combat, and your shield protects from projectiles!
Obey the Servants and do as they \ - tell you. Your primary goal is to defend the Ark from destruction; they are your allies in this, and should be protected from harm." + tell you. Your primary goal is to defend the Ark from destruction; they are your allies in this, and should be protected from harm. \ + Be warned, however, that you will rapidly decay near the void of space." empower_string = "The Anima Bulwark's power flows through you! Your weapon will strike harder, your armor is sturdier, and your shield is more durable." + var/default_speed = 0 var/max_shield_health = 3 var/shield_health = 3 //Amount of projectiles that can be deflected within var/shield_health_regen = 0 //When world.time equals this, shield health will regenerate @@ -36,10 +40,21 @@ /mob/living/simple_animal/hostile/clockwork/marauder/Life() ..() + var/turf/T = get_turf(src) + var/turf/open/space/S = isspaceturf(T)? T : null + var/less_space_damage + if(!istype(S)) + var/turf/open/space/nearS = locate() in oview(1) + if(nearS) + S = nearS + less_space_damage = TRUE + if(S) + to_chat(src, "The void of space drains Ratvar's Light from you! You feel yourself rapidly decaying. It would be wise to get back inside!") + adjustBruteLoss(less_space_damage? MARAUDER_SPACE_NEAR_DAMAGE : MARAUDER_SPACE_FULL_DAMAGE) if(!GLOB.ratvar_awakens && health / maxHealth <= MARAUDER_SLOWDOWN_PERCENTAGE) - speed = initial(speed) + 1 //Yes, this slows them down + speed = default_speed + 1 //Yes, this slows them down else - speed = initial(speed) + speed = default_speed if(shield_health < max_shield_health && world.time >= shield_health_regen) shield_health_regen = world.time + MARAUDER_SHIELD_REGEN_TIME to_chat(src, "Your shield has recovered, [shield_health] blocks remaining!") diff --git a/code/modules/antagonists/clockcult/clock_scriptures/scripture_applications.dm b/code/modules/antagonists/clockcult/clock_scriptures/scripture_applications.dm index 3d467350ff..0fd6c8a8dc 100644 --- a/code/modules/antagonists/clockcult/clock_scriptures/scripture_applications.dm +++ b/code/modules/antagonists/clockcult/clock_scriptures/scripture_applications.dm @@ -87,9 +87,22 @@ object_path = /obj/item/clockwork/construct_chassis/clockwork_marauder construct_type = /mob/living/simple_animal/hostile/clockwork/marauder combat_construct = TRUE - var/static/recent_marauders = 0 - var/static/time_since_last_marauder = 0 - var/static/scaled_recital_time = 0 + var/static/last_marauder = 0 + +/datum/clockwork_scripture/create_object/construct/clockwork_marauder/post_recital() + last_marauder = world.time + return ..() + +/datum/clockwork_scripture/create_object/construct/clockwork_marauder/pre_recital() + if(!is_reebe(invoker.z)) + if(!CONFIG_GET(flag/allow_clockwork_marauder_on_station)) + to_chat(invoker, "This particular station is too far from the influence of the Hierophant Network. You can not summon a marauder here.") + return FALSE + if(world.time < (last_marauder + CONFIG_GET(number/marauder_delay_non_reebe))) + to_chat(invoker, "The hierophant network is still strained from the last summoning of a marauder on a plane without the strong energy connection of Reebe to support it. \ + You must wait another [DisplayTimeText((last_marauder + CONFIG_GET(number/marauder_delay_non_reebe)) - world.time, TRUE)]!") + return FALSE + return ..() /datum/clockwork_scripture/create_object/construct/clockwork_marauder/update_construct_limit() var/human_servants = 0 @@ -98,27 +111,7 @@ var/mob/living/L = M.current if(ishuman(L) && L.stat != DEAD) human_servants++ - construct_limit = round(CLAMP((human_servants / 4), 1, 3)) - recent_marauders //1 per 4 human servants, maximum of 3, reduced by recent marauder creation - if(recent_marauders) - to_chat(invoker, "The Hierophant Network is depleted by a summoning in the last [DisplayTimeText(MARAUDER_SCRIPTURE_SCALING_THRESHOLD, TRUE)] - limiting the number of available marauders by [recent_marauders]!") - -/datum/clockwork_scripture/create_object/construct/clockwork_marauder/pre_recital() - channel_time = initial(channel_time) - if(recent_marauders) - scaled_recital_time = min(recent_marauders * MARAUDER_SCRIPTURE_SCALING_TIME, MARAUDER_SCRIPTURE_SCALING_MAX) - to_chat(invoker, "The Hierophant Network is under strain from repeated summoning, making this scripture [DisplayTimeText(scaled_recital_time)] slower!") - channel_time += scaled_recital_time - return TRUE - -/datum/clockwork_scripture/create_object/construct/clockwork_marauder/scripture_effects() - . = ..() - recent_marauders++ - addtimer(CALLBACK(GLOBAL_PROC, .proc/marauder_reset),MARAUDER_SCRIPTURE_SCALING_THRESHOLD) - -/proc/marauder_reset() - var/datum/clockwork_scripture/create_object/construct/clockwork_marauder/CM = new() - CM.recent_marauders-- - qdel(CM) + construct_limit = round(CLAMP((human_servants / 4), 1, 3)) //1 per 4 human servants, maximum of 3 //Summon Neovgre: Summon a very powerful combat mech that explodes when destroyed for massive damage. /datum/clockwork_scripture/create_object/summon_arbiter @@ -146,6 +139,6 @@ /datum/clockwork_scripture/create_object/summon_arbiter/check_special_requirements() if(GLOB.neovgre_exists) - to_chat(invoker, "\"You've already got one...\"") + to_chat(invoker, "\"Only one of my weapons may exist in this temporal stream!\"") return FALSE return ..() diff --git a/code/modules/antagonists/cult/blood_magic.dm b/code/modules/antagonists/cult/blood_magic.dm index beea67e596..a833aa8a94 100644 --- a/code/modules/antagonists/cult/blood_magic.dm +++ b/code/modules/antagonists/cult/blood_magic.dm @@ -438,21 +438,27 @@ target.visible_message("[L] starts to glow in a halo of light!", \ "A feeling of warmth washes over you, rays of holy light surround your body and protect you from the flash of light!") else - to_chat(user, "In an brilliant flash of red, [L] falls to the ground!") - L.Knockdown(160) - L.adjustStaminaLoss(140) //Ensures hard stamcrit - L.flash_act(1,1) - if(issilicon(target)) - var/mob/living/silicon/S = L - S.emp_act(EMP_HEAVY) - else if(iscarbon(target)) - var/mob/living/carbon/C = L - C.silent += 6 - C.stuttering += 15 - C.cultslurring += 15 - C.Jitter(15) - if(is_servant_of_ratvar(L)) + if(!iscultist(L)) + L.Knockdown(160) + L.adjustStaminaLoss(140) //Ensures hard stamcrit + L.flash_act(1,1) + if(issilicon(target)) + var/mob/living/silicon/S = L + S.emp_act(EMP_HEAVY) + else if(iscarbon(target)) + var/mob/living/carbon/C = L + C.silent += CLAMP(12 - C.silent, 0, 6) + C.stuttering += CLAMP(30 - C.stuttering, 0, 15) + C.cultslurring += CLAMP(30 - C.cultslurring, 0, 15) + C.Jitter(15) + else // cultstun no longer hardstuns + damages hostile cultists, instead debuffs them hard + deals some damage; debuffs for a bit longer since they don't add the clockie belligerent debuff + if(iscarbon(target)) + var/mob/living/carbon/C = L + C.stuttering = max(10, C.stuttering) + C.drowsyness = max(10, C.drowsyness) + C.confused += CLAMP(20 - C.confused, 0, 10) L.adjustBruteLoss(15) + to_chat(user, "In an brilliant flash of red, [L] [iscultist(L) ? "writhes in pain" : "falls to the ground!"]") uses-- ..() diff --git a/code/modules/antagonists/cult/cult.dm b/code/modules/antagonists/cult/cult.dm index 9989058d43..df2383f892 100644 --- a/code/modules/antagonists/cult/cult.dm +++ b/code/modules/antagonists/cult/cult.dm @@ -128,7 +128,8 @@ current.clear_alert("bloodsense") if(ishuman(current)) var/mob/living/carbon/human/H = current - H.eye_color = initial(H.eye_color) + var/obj/item/organ/eyes/eyes = H.getorganslot(ORGAN_SLOT_EYES) + H.eye_color = eyes?.eye_color || initial(H.eye_color) H.dna.update_ui_block(DNA_EYE_COLOR_BLOCK) REMOVE_TRAIT(H, TRAIT_CULT_EYES, "valid_cultist") H.update_body() diff --git a/code/modules/antagonists/cult/cult_items.dm b/code/modules/antagonists/cult/cult_items.dm index 5fe941d32f..b4ddb9dbff 100644 --- a/code/modules/antagonists/cult/cult_items.dm +++ b/code/modules/antagonists/cult/cult_items.dm @@ -703,7 +703,10 @@ else if(!..()) if(!L.anti_magic_check()) if(is_servant_of_ratvar(L)) - L.Knockdown(100) + to_chat(L, "\"Kneel for me, scum\"") + L.confused += CLAMP(10 - L.confused, 0, 5) //confuses and lightly knockdowns + damages hostile cultists instead of hardstunning like before + L.Knockdown(15) + L.adjustBruteLoss(10) else L.Knockdown(50) break_spear(T) diff --git a/code/modules/antagonists/disease/disease_mob.dm b/code/modules/antagonists/disease/disease_mob.dm index 6ac3f93764..516f30d896 100644 --- a/code/modules/antagonists/disease/disease_mob.dm +++ b/code/modules/antagonists/disease/disease_mob.dm @@ -117,7 +117,7 @@ the new instance inside the host to be updated to the template's stats. follow_next(Dir & NORTHWEST) last_move_tick = world.time -/mob/camera/disease/Hear(message, atom/movable/speaker, message_language, raw_message, radio_freq, list/spans, message_mode) +/mob/camera/disease/Hear(message, atom/movable/speaker, message_language, raw_message, radio_freq, list/spans, message_mode, atom/movable/source) . = ..() var/atom/movable/to_follow = speaker if(radio_freq) @@ -129,7 +129,7 @@ the new instance inside the host to be updated to the template's stats. else link = "" // Recompose the message, because it's scrambled by default - message = compose_message(speaker, message_language, raw_message, radio_freq, spans, message_mode) + message = compose_message(speaker, message_language, raw_message, radio_freq, spans, message_mode, FALSE, source) to_chat(src, "[link] [message]") diff --git a/code/modules/antagonists/ert/ert.dm b/code/modules/antagonists/ert/ert.dm index 5968c7643a..0fb41cabc8 100644 --- a/code/modules/antagonists/ert/ert.dm +++ b/code/modules/antagonists/ert/ert.dm @@ -34,6 +34,12 @@ . = ..() name_source = GLOB.commando_names +/datum/antagonist/ert/deathsquad/apply_innate_effects(mob/living/mob_override) + ADD_TRAIT(owner, TRAIT_DISK_VERIFIER, DEATHSQUAD_TRAIT) + +/datum/antagonist/ert/deathsquad/remove_innate_effects(mob/living/mob_override) + REMOVE_TRAIT(owner, TRAIT_DISK_VERIFIER, DEATHSQUAD_TRAIT) + /datum/antagonist/ert/security // kinda handled by the base template but here for completion /datum/antagonist/ert/security/amber diff --git a/code/modules/antagonists/nukeop/equipment/nuclearbomb.dm b/code/modules/antagonists/nukeop/equipment/nuclearbomb.dm index 8021ee5f08..e1c50a7cf5 100644 --- a/code/modules/antagonists/nukeop/equipment/nuclearbomb.dm +++ b/code/modules/antagonists/nukeop/equipment/nuclearbomb.dm @@ -611,10 +611,7 @@ This is here to make the tiles around the station mininuke change when it's arme if(!fake) return - var/ghost = isobserver(user) - var/captain = user.mind && user.mind.assigned_role == "Captain" - var/nukie = user.mind && user.mind.has_antag_datum(/datum/antagonist/nukeop) - if(ghost || captain || nukie) + if(isobserver(user) || HAS_TRAIT(user, TRAIT_DISK_VERIFIER) || (user.mind && HAS_TRAIT(user.mind, TRAIT_DISK_VERIFIER))) . += "The serial numbers on [src] are incorrect." /obj/item/disk/nuclear/attackby(obj/item/I, mob/living/user, params) @@ -653,3 +650,7 @@ This is here to make the tiles around the station mininuke change when it's arme /obj/item/disk/nuclear/fake fake = TRUE + +/obj/item/disk/nuclear/fake/obvious + name = "cheap plastic imitation of the nuclear authentication disk" + desc = "How anyone could mistake this for the real thing is beyond you." diff --git a/code/modules/antagonists/nukeop/nukeop.dm b/code/modules/antagonists/nukeop/nukeop.dm index 4604439fc8..d343951d53 100644 --- a/code/modules/antagonists/nukeop/nukeop.dm +++ b/code/modules/antagonists/nukeop/nukeop.dm @@ -23,10 +23,12 @@ /datum/antagonist/nukeop/apply_innate_effects(mob/living/mob_override) var/mob/living/M = mob_override || owner.current update_synd_icons_added(M) + ADD_TRAIT(owner, TRAIT_DISK_VERIFIER, NUKEOP_TRAIT) /datum/antagonist/nukeop/remove_innate_effects(mob/living/mob_override) var/mob/living/M = mob_override || owner.current update_synd_icons_removed(M) + REMOVE_TRAIT(owner, TRAIT_DISK_VERIFIER, NUKEOP_TRAIT) /datum/antagonist/nukeop/proc/equip_op() if(!ishuman(owner.current)) @@ -42,7 +44,6 @@ owner.current.playsound_local(get_turf(owner.current), 'sound/ambience/antag/ops.ogg',100,0) to_chat(owner, "You are a [nuke_team ? nuke_team.syndicate_name : "syndicate"] agent!") owner.announce_objectives() - return /datum/antagonist/nukeop/on_gain() give_alias() diff --git a/code/modules/antagonists/revenant/revenant_abilities.dm b/code/modules/antagonists/revenant/revenant_abilities.dm index 17d200a685..d6582a294f 100644 --- a/code/modules/antagonists/revenant/revenant_abilities.dm +++ b/code/modules/antagonists/revenant/revenant_abilities.dm @@ -5,7 +5,7 @@ ShiftClickOn(A) return if(modifiers["alt"]) - AltClickNoInteract(src, A) + altclick_listed_turf(A) return if(ishuman(A)) diff --git a/code/modules/antagonists/slaughter/slaughter.dm b/code/modules/antagonists/slaughter/slaughter.dm index f27da5f667..c669ff7877 100644 --- a/code/modules/antagonists/slaughter/slaughter.dm +++ b/code/modules/antagonists/slaughter/slaughter.dm @@ -33,6 +33,7 @@ melee_damage_lower = 30 melee_damage_upper = 30 see_in_dark = 8 + blood_volume = 0 //No bleeding on getting shot, for skeddadles lighting_alpha = LIGHTING_PLANE_ALPHA_MOSTLY_INVISIBLE bloodcrawl = BLOODCRAWL_EAT var/playstyle_string = "You are a slaughter demon, a terrible creature from another realm. You have a single desire: To kill. \ diff --git a/code/modules/antagonists/swarmer/swarmer_event.dm b/code/modules/antagonists/swarmer/swarmer_event.dm index e086485a49..8e385f6674 100644 --- a/code/modules/antagonists/swarmer/swarmer_event.dm +++ b/code/modules/antagonists/swarmer/swarmer_event.dm @@ -1,8 +1,8 @@ /datum/round_event_control/spawn_swarmer name = "Spawn Swarmer Shell" typepath = /datum/round_event/spawn_swarmer - weight = 7 - max_occurrences = 1 //Only once okay fam + weight = 0 + max_occurrences = 0 earliest_start = 30 MINUTES min_players = 15 diff --git a/code/modules/antagonists/traitor/equipment/Malf_Modules.dm b/code/modules/antagonists/traitor/equipment/Malf_Modules.dm index 56954f8718..3cc3b48e50 100644 --- a/code/modules/antagonists/traitor/equipment/Malf_Modules.dm +++ b/code/modules/antagonists/traitor/equipment/Malf_Modules.dm @@ -505,6 +505,7 @@ GLOBAL_LIST_INIT(blacklisted_malf_machines, typecacheof(list( if(!is_station_level(F.z)) continue F.obj_flags |= EMAGGED + F.update_icon() to_chat(owner, "All thermal sensors on the station have been disabled. Fire alerts will no longer be recognized.") owner.playsound_local(owner, 'sound/machines/terminal_off.ogg', 50, 0) diff --git a/code/modules/antagonists/wizard/equipment/spellbook.dm b/code/modules/antagonists/wizard/equipment/spellbook.dm index c5308cf0c0..dfde04836d 100644 --- a/code/modules/antagonists/wizard/equipment/spellbook.dm +++ b/code/modules/antagonists/wizard/equipment/spellbook.dm @@ -141,6 +141,10 @@ name = "Disintegrate" spell_type = /obj/effect/proc_holder/spell/targeted/touch/disintegrate +/datum/spellbook_entry/nuclearfist + name = "Nuclear Fist" + spell_type = /obj/effect/proc_holder/spell/targeted/touch/nuclear_fist + /datum/spellbook_entry/disabletech name = "Disable Tech" spell_type = /obj/effect/proc_holder/spell/targeted/emplosion/disable_tech @@ -392,6 +396,12 @@ dynamic_requirement = 50 dynamic_cost = 10 +/datum/spellbook_entry/item/plasmafist + name = "Plasma Fist" + desc = "A forbidden martial art designed on the surging power of plasma. Use it to harness the ancient power." + item_path = /obj/item/book/granter/martial/plasma_fist + cost = 3 + /datum/spellbook_entry/item/guardian name = "Guardian Deck" desc = "A deck of guardian tarot cards, capable of binding a personal guardian to your body. There are multiple types of guardian available, but all of them will transfer some amount of damage to you. \ diff --git a/code/modules/antagonists/wizard/wizard.dm b/code/modules/antagonists/wizard/wizard.dm index 9b2532c71b..a88eb1e42a 100644 --- a/code/modules/antagonists/wizard/wizard.dm +++ b/code/modules/antagonists/wizard/wizard.dm @@ -177,6 +177,10 @@ owner.AddSpell(new /obj/effect/proc_holder/spell/aoe_turf/knock(null)) owner.AddSpell(new /obj/effect/proc_holder/spell/targeted/mind_transfer(null)) to_chat(owner, "Your service has not gone unrewarded, however. Studying under [master.current.real_name], you have learned stealthy, robeless spells. You are able to cast knock and mindswap.") + if(APPRENTICE_MARTIAL) + owner.AddSpell(new /obj/effect/proc_holder/spell/targeted/touch/nuclear_fist(null)) + H.put_in_hands(new /obj/item/book/granter/martial/plasma_fist(H)) + to_chat(owner, "Your service has not gone unrewarded, however. Studying under [master.current.real_name], you have learned mystical martial abilities. You are also able to use the Nuclear Fist at will.") /datum/antagonist/wizard/apprentice/create_objectives() var/datum/objective/protect/new_objective = new /datum/objective/protect diff --git a/code/modules/assembly/voice.dm b/code/modules/assembly/voice.dm index 7ad5f827e1..f72f726988 100644 --- a/code/modules/assembly/voice.dm +++ b/code/modules/assembly/voice.dm @@ -25,7 +25,7 @@ . = ..() . += "Use a multitool to swap between \"inclusive\", \"exclusive\", \"recognizer\", and \"voice sensor\" mode." -/obj/item/assembly/voice/Hear(message, atom/movable/speaker, message_language, raw_message, radio_freq, list/spans, message_mode) +/obj/item/assembly/voice/Hear(message, atom/movable/speaker, message_language, raw_message, radio_freq, list/spans, message_mode, atom/movable/source) . = ..() if(speaker == src) return diff --git a/code/modules/atmospherics/machinery/airalarm.dm b/code/modules/atmospherics/machinery/airalarm.dm index 58ab9c6183..cbbfc05f39 100644 --- a/code/modules/atmospherics/machinery/airalarm.dm +++ b/code/modules/atmospherics/machinery/airalarm.dm @@ -823,11 +823,11 @@ return ..() /obj/machinery/airalarm/AltClick(mob/user) - ..() + . = ..() if(!user.canUseTopic(src, !issilicon(user)) || !isturf(loc)) return - else - togglelock(user) + togglelock(user) + return TRUE /obj/machinery/airalarm/proc/togglelock(mob/living/user) if(stat & (NOPOWER|BROKEN)) diff --git a/code/modules/atmospherics/machinery/atmosmachinery.dm b/code/modules/atmospherics/machinery/atmosmachinery.dm index 2e4cccf5a3..ee4d1bda11 100644 --- a/code/modules/atmospherics/machinery/atmosmachinery.dm +++ b/code/modules/atmospherics/machinery/atmosmachinery.dm @@ -338,10 +338,9 @@ Pipelines + Other Objects -> Pipe network /obj/machinery/atmospherics/AltClick(mob/living/L) - if(is_type_in_list(src, GLOB.ventcrawl_machinery)) - L.handle_ventcrawl(src) - return - ..() + if(is_type_in_typecache(src, GLOB.ventcrawl_machinery)) + return L.handle_ventcrawl(src) + return ..() /obj/machinery/atmospherics/proc/can_crawl_through() diff --git a/code/modules/atmospherics/machinery/components/binary_devices/pump.dm b/code/modules/atmospherics/machinery/components/binary_devices/pump.dm index b95b15efbd..c05c3bb3c9 100644 --- a/code/modules/atmospherics/machinery/components/binary_devices/pump.dm +++ b/code/modules/atmospherics/machinery/components/binary_devices/pump.dm @@ -44,6 +44,7 @@ Thus, the two variables affect pump operation are set in New(): return ..() /obj/machinery/atmospherics/components/binary/pump/AltClick(mob/user) + . = ..() var/area/A = get_area(src) var/turf/T = get_turf(src) if(user.canUseTopic(src, BE_CLOSE, FALSE,)) @@ -51,6 +52,7 @@ Thus, the two variables affect pump operation are set in New(): to_chat(user,"You maximize the pressure on the [src].") investigate_log("Pump, [src.name], was maximized by [key_name(usr)] at [x], [y], [z], [A]", INVESTIGATE_ATMOS) message_admins("Pump, [src.name], was maximized by [ADMIN_LOOKUPFLW(usr)] at [ADMIN_COORDJMP(T)], [A]") + return TRUE /obj/machinery/atmospherics/components/binary/pump/layer1 piping_layer = PIPING_LAYER_MIN diff --git a/code/modules/atmospherics/machinery/components/trinary_devices/filter.dm b/code/modules/atmospherics/machinery/components/trinary_devices/filter.dm index ae3eb8a877..adca444b10 100644 --- a/code/modules/atmospherics/machinery/components/trinary_devices/filter.dm +++ b/code/modules/atmospherics/machinery/components/trinary_devices/filter.dm @@ -28,6 +28,7 @@ return ..() /obj/machinery/atmospherics/components/trinary/filter/AltClick(mob/user) + . = ..() var/area/A = get_area(src) var/turf/T = get_turf(src) if(user.canUseTopic(src, BE_CLOSE, FALSE,)) @@ -35,6 +36,7 @@ to_chat(user,"You maximize the flow rate on the [src].") investigate_log("Filter, [src.name], was maximized by [key_name(usr)] at [x], [y], [z], [A]", INVESTIGATE_ATMOS) message_admins("Filter, [src.name], was maximized by [ADMIN_LOOKUPFLW(usr)] at [ADMIN_COORDJMP(T)], [A]") + return TRUE /obj/machinery/atmospherics/components/trinary/filter/layer1 piping_layer = PIPING_LAYER_MIN diff --git a/code/modules/atmospherics/machinery/components/trinary_devices/mixer.dm b/code/modules/atmospherics/machinery/components/trinary_devices/mixer.dm index 9e4deaf3d8..9646b78321 100644 --- a/code/modules/atmospherics/machinery/components/trinary_devices/mixer.dm +++ b/code/modules/atmospherics/machinery/components/trinary_devices/mixer.dm @@ -30,6 +30,7 @@ return ..() /obj/machinery/atmospherics/components/trinary/mixer/AltClick(mob/user) + . = ..() var/area/A = get_area(src) var/turf/T = get_turf(src) if(user.canUseTopic(src, BE_CLOSE, FALSE,)) @@ -37,6 +38,7 @@ to_chat(user,"You maximize the pressure on the [src].") investigate_log("Mixer, [src.name], was maximized by [key_name(usr)] at [x], [y], [z], [A]", INVESTIGATE_ATMOS) message_admins("Mixer, [src.name], was maximized by [ADMIN_LOOKUPFLW(usr)] at [ADMIN_COORDJMP(T)], [A]") + return TRUE //node 3 is the outlet, nodes 1 & 2 are intakes /obj/machinery/atmospherics/components/trinary/mixer/layer1 diff --git a/code/modules/atmospherics/machinery/components/unary_devices/cryo.dm b/code/modules/atmospherics/machinery/components/unary_devices/cryo.dm index ca8b21593f..0a54503be5 100644 --- a/code/modules/atmospherics/machinery/components/unary_devices/cryo.dm +++ b/code/modules/atmospherics/machinery/components/unary_devices/cryo.dm @@ -399,13 +399,14 @@ return ..() /obj/machinery/atmospherics/components/unary/cryo_cell/AltClick(mob/user) + . = ..() if(user.canUseTopic(src, BE_CLOSE, FALSE, NO_TK)) if(state_open) close_machine() else open_machine() update_icon() - return ..() + return TRUE /obj/machinery/atmospherics/components/unary/cryo_cell/update_remote_sight(mob/living/user) return // we don't see the pipe network while inside cryo. diff --git a/code/modules/atmospherics/machinery/components/unary_devices/tank.dm b/code/modules/atmospherics/machinery/components/unary_devices/tank.dm index 4f16406456..4dd2216b19 100644 --- a/code/modules/atmospherics/machinery/components/unary_devices/tank.dm +++ b/code/modules/atmospherics/machinery/components/unary_devices/tank.dm @@ -36,6 +36,10 @@ icon_state = "red" gas_type = /datum/gas/nitrogen +/obj/machinery/atmospherics/components/unary/tank/nitrous_oxide + icon_state = "red_white" + gas_type = /datum/gas/nitrous_oxide + /obj/machinery/atmospherics/components/unary/tank/air icon_state = "grey" name = "pressure tank (Air)" diff --git a/code/modules/atmospherics/machinery/components/unary_devices/thermomachine.dm b/code/modules/atmospherics/machinery/components/unary_devices/thermomachine.dm index b52dc158e4..2e06e68709 100644 --- a/code/modules/atmospherics/machinery/components/unary_devices/thermomachine.dm +++ b/code/modules/atmospherics/machinery/components/unary_devices/thermomachine.dm @@ -210,13 +210,15 @@ min_temperature = max(T0C - (initial(min_temperature) + L * 15), TCMB) //73.15K with T1 stock parts /obj/machinery/atmospherics/components/unary/thermomachine/freezer/AltClick(mob/living/user) + . = ..() var/area/A = get_area(src) var/turf/T = get_turf(src) if(!istype(user) || !user.canUseTopic(src, BE_CLOSE)) return - target_temperature = min_temperature + target_temperature = min_temperature investigate_log("was set to [target_temperature] K by [key_name(usr)]", INVESTIGATE_ATMOS) message_admins("[src.name] was minimized by [ADMIN_LOOKUPFLW(usr)] at [ADMIN_COORDJMP(T)], [A]") + return TRUE /obj/machinery/atmospherics/components/unary/thermomachine/heater name = "heater" @@ -240,6 +242,7 @@ max_temperature = T20C + (initial(max_temperature) * L) //573.15K with T1 stock parts /obj/machinery/atmospherics/components/unary/thermomachine/heater/AltClick(mob/living/user) + . = ..() var/area/A = get_area(src) var/turf/T = get_turf(src) if(!istype(user) || !user.canUseTopic(src, BE_CLOSE)) @@ -247,3 +250,4 @@ target_temperature = max_temperature investigate_log("was set to [target_temperature] K by [key_name(usr)]", INVESTIGATE_ATMOS) message_admins("[src.name] was maximized by [ADMIN_LOOKUPFLW(usr)] at [ADMIN_COORDJMP(T)], [A]") + return TRUE diff --git a/code/modules/atmospherics/machinery/datum_pipeline.dm b/code/modules/atmospherics/machinery/datum_pipeline.dm index 38178a4339..19f3f58708 100644 --- a/code/modules/atmospherics/machinery/datum_pipeline.dm +++ b/code/modules/atmospherics/machinery/datum_pipeline.dm @@ -154,6 +154,11 @@ var/partial_heat_capacity = total_heat_capacity*(share_volume/air.volume) var/target_temperature var/target_heat_capacity + // first calculate heat from radiation. there's an implied "* 1 tick" here. + // 0.05 magic multiplicand is, first, 0.1 deciseconds; second, half of the radiation's going right back into the gas. + var/share_constant = STEFANBOLTZMANN*(share_volume**(2/3))*0.05 + // Minimizing temp to 4 billion is mostly to prevent -infinity temperatures. + var/heat = share_constant*(min(air.temperature,4000000000)**4) if(isopenturf(target)) @@ -165,8 +170,8 @@ if((modeled_location.heat_capacity>0) && (partial_heat_capacity>0)) var/delta_temperature = air.temperature - target_temperature - - var/heat = thermal_conductivity*delta_temperature* \ + heat -= share_constant*(min(target_temperature,4000000000)**4) + heat += thermal_conductivity*delta_temperature* \ (partial_heat_capacity*target_heat_capacity/(partial_heat_capacity+target_heat_capacity)) air.temperature -= heat/total_heat_capacity @@ -183,7 +188,8 @@ var/sharer_temperature_delta = 0 if((sharer_heat_capacity>0) && (partial_heat_capacity>0)) - var/heat = thermal_conductivity*delta_temperature* \ + heat -= share_constant*(min(target_temperature,4000000000)**4) + heat += thermal_conductivity*delta_temperature* \ (partial_heat_capacity*sharer_heat_capacity/(partial_heat_capacity+sharer_heat_capacity)) self_temperature_delta = -heat/total_heat_capacity @@ -199,10 +205,12 @@ if((target.heat_capacity>0) && (partial_heat_capacity>0)) var/delta_temperature = air.temperature - target.temperature - var/heat = thermal_conductivity*delta_temperature* \ + heat -= share_constant*(min(target.temperature,4000000000)**4) + heat += thermal_conductivity*delta_temperature* \ (partial_heat_capacity*target.heat_capacity/(partial_heat_capacity+target.heat_capacity)) air.temperature -= heat/total_heat_capacity + air.temperature = CLAMP(air.temperature,TCMB,INFINITY) // i have no idea why TCMB needs to be the min but i ain't changing it update = TRUE /datum/pipeline/proc/return_air() diff --git a/code/modules/atmospherics/machinery/pipes/heat_exchange/he_pipes.dm b/code/modules/atmospherics/machinery/pipes/heat_exchange/he_pipes.dm index b087859a47..79aa957d97 100644 --- a/code/modules/atmospherics/machinery/pipes/heat_exchange/he_pipes.dm +++ b/code/modules/atmospherics/machinery/pipes/heat_exchange/he_pipes.dm @@ -26,9 +26,7 @@ var/turf/T = loc if(istype(T)) - if(islava(T)) - environment_temperature = 5000 - else if(T.blocks_air) + if(T.blocks_air) environment_temperature = T.temperature else var/turf/open/OT = T diff --git a/code/modules/atmospherics/machinery/portable/portable_atmospherics.dm b/code/modules/atmospherics/machinery/portable/portable_atmospherics.dm index 81540b0698..b47b6b42c1 100644 --- a/code/modules/atmospherics/machinery/portable/portable_atmospherics.dm +++ b/code/modules/atmospherics/machinery/portable/portable_atmospherics.dm @@ -81,11 +81,13 @@ return air_contents /obj/machinery/portable_atmospherics/AltClick(mob/living/user) + . = ..() if(!istype(user) || !user.canUseTopic(src, BE_CLOSE, !ismonkey(user))) return if(holding) to_chat(user, "You remove [holding] from [src].") replace_tank(user, TRUE) + return TRUE /obj/machinery/portable_atmospherics/examine(mob/user) . = ..() diff --git a/code/modules/cargo/packs/armory.dm b/code/modules/cargo/packs/armory.dm index ee983784fe..58677814a6 100644 --- a/code/modules/cargo/packs/armory.dm +++ b/code/modules/cargo/packs/armory.dm @@ -61,7 +61,7 @@ /datum/supply_pack/security/armory/dragnetgun name = "DRAGnet gun Crate" - desc = "Contains two DRAGnet gun. A Dynamic Rapid-Apprehension of the Guilty net the revolution in law enforcement technology that YOU Want! Requires Armory access to open." + desc = "Contains two DRAGnet guns. A Dynamic Rapid-Apprehension of the Guilty net the revolution in law enforcement technology that YOU Want! Requires Armory access to open." cost = 3250 contains = list(/obj/item/gun/energy/e_gun/dragnet, /obj/item/gun/energy/e_gun/dragnet) diff --git a/code/modules/cargo/packs/emergency.dm b/code/modules/cargo/packs/emergency.dm index 1987369d20..30153ef077 100644 --- a/code/modules/cargo/packs/emergency.dm +++ b/code/modules/cargo/packs/emergency.dm @@ -44,8 +44,51 @@ crate_name = "emergency crate" crate_type = /obj/structure/closet/crate/internals +/datum/supply_pack/emergency/medicalemergency + name = "Emergency Medical Supplies" //Almost all of this can be ordered seperatly for a much cheaper price, but the HUD increases it. + desc = "Emergency supplies for a front-line medic. Contains two boxes of body bags, a medical HUD, a defib unit, medical belt, toxin bottles, epipens, and several types of medical kits." + cost = 10000 + contains = list(/obj/item/storage/box/bodybags, + /obj/item/storage/box/bodybags, + /obj/item/clothing/glasses/hud/health, + /obj/item/defibrillator/loaded, + /obj/item/storage/belt/medical, + /obj/item/storage/firstaid/toxin, + /obj/item/storage/firstaid/o2, + /obj/item/storage/firstaid/brute, + /obj/item/storage/firstaid/fire, + /obj/item/reagent_containers/glass/bottle/toxin, + /obj/item/reagent_containers/glass/bottle/toxin, + /obj/item/storage/box/medipens) + crate_name = "medical emergency crate" + crate_type = /obj/structure/closet/crate/medical + +/datum/supply_pack/emergency/medemergencylite + name = "Emergency Medical Supplies (Lite)" + desc = "A less than optimal, but still effective, set of tools for emergency care. Contains a box of bodybags, some normal (and advanced) health analyzers, healing sprays, a single first aid kit, charcoal, some gauze, a bottle of toxins, and some spare medipens." + cost = 2800 + contains = list(/obj/item/storage/box/bodybags, + /obj/item/stack/medical/gauze, + /obj/item/stack/medical/gauze, + /obj/item/healthanalyzer, + /obj/item/healthanalyzer, + /obj/item/healthanalyzer/advanced, + /obj/item/storage/firstaid/regular, + /obj/item/reagent_containers/medspray/styptic, + /obj/item/reagent_containers/medspray/silver_sulf, + /obj/item/reagent_containers/medspray/synthflesh, + /obj/item/reagent_containers/glass/bottle/charcoal, + /obj/item/reagent_containers/glass/bottle/charcoal, + /obj/item/reagent_containers/glass/bottle/toxin, + /obj/item/reagent_containers/hypospray/medipen, + /obj/item/reagent_containers/hypospray/medipen, + /obj/item/reagent_containers/hypospray/medipen, + /obj/item/reagent_containers/hypospray/medipen) + crate_name = "medical emergency crate (lite)" + crate_type = /obj/structure/closet/crate/medical + /datum/supply_pack/emergency/radiatione_emergency - name = "Emergenc Radiation Protection Crate" + name = "Emergency Radiation Protection Crate" desc = "Survive the Nuclear Apocalypse and Supermatter Engine alike with two sets of Radiation suits. Each set contains a helmet, suit, and Geiger counter. We'll even throw in a few pill bottles that are able to handles radiation and the affects of the poisoning." cost = 2500 contains = list(/obj/item/clothing/head/radiation, @@ -61,7 +104,7 @@ /datum/supply_pack/emergency/rcds name = "Emergency RCDs" - desc = "Bombs going off on station? SME blown and now you need to fix the hole it left behind? Well this crate has a pare of Rcds to be able to easily fix up any problem you may have!" + desc = "Bombs going off on station? SME blown and now you need to fix the hole it left behind? Well this crate has a pare of RCDs to be able to easily fix up any problem you may have!" cost = 1500 contains = list(/obj/item/construction/rcd, /obj/item/construction/rcd) @@ -70,7 +113,7 @@ /datum/supply_pack/emergency/soft_suit name = "Emergency Space Suit " - desc = "Is there bombs going off left and right? Is there meteors shooting around the station? Well we have two fragile space suit for emergencys as well as air and masks." + desc = "Are there bombs going off left and right? Are there meteors shooting around the station? Well then! Here's two fragile space suit for emergencies. Comes with air and masks." cost = 1200 contains = list(/obj/item/tank/internals/air, /obj/item/tank/internals/air, @@ -137,6 +180,18 @@ /obj/item/storage/box/metalfoam) crate_name = "metal foam grenade crate" +/datum/supply_pack/emergency/mre + name = "MRE supply kit (emergency rations)" + desc = "The lights are out. Oxygen's running low. You've run out of food except space weevils. Don't let this be you! Order our NT branded MRE kits today! This pack contains 5 MRE packs with a randomized menu and an oxygen tank." + cost = 2000 + contains = list(/obj/item/storage/box/mre/menu1/safe, + /obj/item/storage/box/mre/menu1/safe, + /obj/item/storage/box/mre/menu2/safe, + /obj/item/storage/box/mre/menu2/safe, + /obj/item/storage/box/mre/menu3, + /obj/item/storage/box/mre/menu4/safe) + crate_name = "MRE crate (emergency rations)" + /datum/supply_pack/emergency/syndicate name = "NULL_ENTRY" desc = "(#@&^$THIS PACKAGE CONTAINS 30TC WORTH OF SOME RANDOM SYNDICATE GEAR WE HAD LYING AROUND THE WAREHOUSE. GIVE EM HELL, OPERATIVE@&!*() " @@ -205,7 +260,6 @@ name = "Space Suit Crate" desc = "Contains two aging suits from Space-Goodwill. Requires EVA access to open." cost = 3000 - access = ACCESS_EVA contains = list(/obj/item/clothing/suit/space, /obj/item/clothing/suit/space, /obj/item/clothing/head/helmet/space, @@ -254,22 +308,3 @@ crate_name = "weed control crate" crate_type = /obj/structure/closet/crate/secure/hydroponics -/datum/supply_pack/medical/anitvirus - name = "Virus Containment Crate" - desc = "Viro let out a death plague Mk II again? Someone didnt wash there hands? Old plagues born anew? Well this crate is for you! Hope you cure it before it brakes out of the station... This crate needs medical access to open and has two bio suits, a box of needles and beakers, five spaceacillin needles, and a medibot." - cost = 3000 - access = ACCESS_MEDICAL - contains = list(/mob/living/simple_animal/bot/medbot, - /obj/item/clothing/head/bio_hood, - /obj/item/clothing/head/bio_hood, - /obj/item/clothing/suit/bio_suit, - /obj/item/clothing/suit/bio_suit, - /obj/item/reagent_containers/syringe/antiviral, - /obj/item/reagent_containers/syringe/antiviral, - /obj/item/reagent_containers/syringe/antiviral, - /obj/item/reagent_containers/syringe/antiviral, - /obj/item/reagent_containers/syringe/antiviral, - /obj/item/storage/box/syringes, - /obj/item/storage/box/beakers) - crate_name = "virus containment unit crate" - crate_type = /obj/structure/closet/crate/secure/plasma diff --git a/code/modules/cargo/packs/engine.dm b/code/modules/cargo/packs/engine.dm index a4438c7ef8..499881a110 100644 --- a/code/modules/cargo/packs/engine.dm +++ b/code/modules/cargo/packs/engine.dm @@ -27,7 +27,7 @@ /datum/supply_pack/engine/am_shielding name = "Antimatter Shielding Crate" - desc = "Contains ten Antimatter shields, somehow crammed into a crate." + desc = "Contains nine Antimatter shields, somehow crammed into a crate." cost = 2500 contains = list(/obj/item/am_shielding_container, /obj/item/am_shielding_container, @@ -37,8 +37,7 @@ /obj/item/am_shielding_container, /obj/item/am_shielding_container, /obj/item/am_shielding_container, - /obj/item/am_shielding_container, - /obj/item/am_shielding_container) //10 shields: 3x3 containment and a core + /obj/item/am_shielding_container) //9 shields: 3x3 containment and a core crate_name = "antimatter shielding crate" /datum/supply_pack/engine/emitter diff --git a/code/modules/cargo/packs/engineering.dm b/code/modules/cargo/packs/engineering.dm index b226ac7a94..f09c9e429d 100644 --- a/code/modules/cargo/packs/engineering.dm +++ b/code/modules/cargo/packs/engineering.dm @@ -56,6 +56,7 @@ name = "Engineering Hardsuit" desc = "Poly 'Who stole all the hardsuits!' Well now you can get more hardsuits if needed! NOTE ONE HARDSUIT IS IN THIS CRATE, as well as one air tank and mask!" cost = 2250 + access = ACCESS_ENGINE contains = list(/obj/item/tank/internals/air, /obj/item/clothing/mask/gas, /obj/item/clothing/suit/space/hardsuit/engine) @@ -65,7 +66,7 @@ name = "Atmospherics Hardsuit" desc = "Too many techs and not enough hardsuits? Time to buy some more! Comes with gas mask and air tank. Ask the CE to open." cost = 5000 - access = ACCESS_CE + access = ACCESS_CE //100% Fire and Bio resistance contains = list(/obj/item/tank/internals/air, /obj/item/clothing/mask/gas, /obj/item/clothing/suit/space/hardsuit/engine/atmos) @@ -74,7 +75,7 @@ /datum/supply_pack/engineering/industrialrcd name = "Industrial RCD" - desc = "A industrial RCD in case the station has gone through more then one meteor storm and the CE needs to bring out the somthing a bit more reliable. Dose not contain spare ammo for the industrial RCD or any other RCD modles." + desc = "An industrial RCD in case the station has gone through more then one meteor storm and the CE needs to bring out the somthing a bit more reliable. Does not contain spare ammo for the industrial RCD or any other RCD models." cost = 4500 access = ACCESS_CE contains = list(/obj/item/construction/rcd/industrial) @@ -152,7 +153,7 @@ /datum/supply_pack/engineering/dna_vault name = "DNA Vault Parts" - desc = "Secure the longevity of the current state of humanity within this massive library of scientific knowledge, capable of granting superhuman powers and abilities. Highly advanced research is required for proper construction. Also contains five DNA probes." + desc = "Secure the longevity of the current state of civilization within this massive library of scientific knowledge, capable of granting superhuman powers and abilities. Highly advanced research is required for proper construction. Also contains five DNA probes." //C'mon now, it's nae just humans on the station these days cost = 12000 special = TRUE contains = list( diff --git a/code/modules/cargo/packs/livestock.dm b/code/modules/cargo/packs/livestock.dm index 9ab1827784..1b55c0540a 100644 --- a/code/modules/cargo/packs/livestock.dm +++ b/code/modules/cargo/packs/livestock.dm @@ -58,7 +58,7 @@ name = "Chicken Crate" desc = "The chicken goes bwaak!" cost = 2000 - contains = list( /mob/living/simple_animal/chick) + contains = list(/mob/living/simple_animal/chick) crate_name = "chicken crate" /datum/supply_pack/critter/crab @@ -135,7 +135,7 @@ /obj/item/clothing/neck/petcollar) crate_name = "pug crate" -/datum/supply_pack/organic/critter/kiwi +/datum/supply_pack/critter/kiwi name = "Space kiwi Crate" cost = 2000 contains = list( /mob/living/simple_animal/kiwi) @@ -150,6 +150,18 @@ /mob/living/simple_animal/hostile/retaliate/poison/snake) crate_name = "snake crate" +/datum/supply_pack/critter/mouse + name = "Mouse Crate" + desc = "Good for snakes and lizards of all ages. Contains ~12 feeder mice." + cost = 2000 + contains = list(/mob/living/simple_animal/mouse,) + crate_name = "mouse crate" + +/datum/supply_pack/critter/mouse/generate() + . = ..() + for(var/i in 1 to 11) + new /mob/living/simple_animal/mouse(.) + /datum/supply_pack/critter/secbat name = "Security Bat Crate" desc = "Contains five security bats, perfect to Bat-up any security officer." diff --git a/code/modules/cargo/packs/materials.dm b/code/modules/cargo/packs/materials.dm index 8bee679b9d..c9862282dc 100644 --- a/code/modules/cargo/packs/materials.dm +++ b/code/modules/cargo/packs/materials.dm @@ -9,6 +9,10 @@ /datum/supply_pack/materials group = "Canisters & Materials" +////////////////////////////////////////////////////////////////////////////// +///////////////////////////// Materials ////////////////////////////////////// +////////////////////////////////////////////////////////////////////////////// + /datum/supply_pack/materials/cardboard50 name = "50 Cardboard Sheets" desc = "Create a bunch of boxes." @@ -58,6 +62,13 @@ contains = list(/obj/item/stack/sheet/mineral/sandstone/thirty) crate_name = "sandstone blocks crate" +/datum/supply_pack/materials/rawlumber + name = "50 Towercap Logs" + desc = "Raw logs from towercaps. Contains fifty logs." + cost = 1000 + contains = list(/obj/item/grown/log) + crate_name = "lumber crate" + /datum/supply_pack/materials/wood50 name = "50 Wood Planks" desc = "Turn cargo's boring metal groundwork into beautiful panelled flooring and much more with fifty wooden planks!" @@ -65,22 +76,31 @@ contains = list(/obj/item/stack/sheet/mineral/wood/fifty) crate_name = "wood planks crate" -/datum/supply_pack/organic/rawcotton +/datum/supply_pack/materials/rawcotton name = "Raw Cotton Crate" desc = "Plushies have been on the down in the market, and now due to a flood of raw cotton the price of it is so cheap, its a steal! Contains 40 raw cotton sheets." - cost = 800 // 100 net cost, 20 x 20 = 400. 300 proffit if turned into cloth sheets or more if turned to silk then 10 x 200 = 2000 + cost = 800 // 100 net cost, 20 x 20 = 400. 300 profit if turned into cloth sheets or more if turned to silk then 10 x 200 = 2000 contains = list(/obj/item/stack/sheet/cotton/thirty, /obj/item/stack/sheet/cotton/ten ) crate_name = "cotton crate" crate_type = /obj/structure/closet/crate/hydroponics -/datum/supply_pack/organic/rawlumber - name = "Raw Lumber Crate" - desc = "Raw logs from towercaps. Contains fifty logs." - cost = 1000 - contains = list(/obj/item/grown/log) - crate_name = "lumber crate" +/datum/supply_pack/materials/rawcottonbulk + name = "Raw Cotton Crate (Bulk)" + desc = "We have so much of this stuff we need to get rid of it in -bulk- now. This crate contains 240 raw cotton sheets." + cost = 1300 // 100 net cost (per 40 cotton) , 20 x 20 = 400. 300 profit if turned into cloth sheets or more if turned to silk then 10 x 200 = 2000 + contains = list(/obj/item/stack/sheet/cotton/thirty, + /obj/item/stack/sheet/cotton/thirty, + /obj/item/stack/sheet/cotton/thirty, + /obj/item/stack/sheet/cotton/thirty, + /obj/item/stack/sheet/cotton/thirty, + /obj/item/stack/sheet/cotton/thirty, + /obj/item/stack/sheet/cotton/thirty, + /obj/item/stack/sheet/cotton/thirty, + ) + crate_name = "bulk cotton crate" + crate_type = /obj/structure/closet/crate/hydroponics /datum/supply_pack/critter/animal_feed/generate() . = ..() @@ -89,7 +109,7 @@ /datum/supply_pack/materials/rcdammo name = "Spare RDC ammo" - desc = "This crate contains sixteen RCD ammo packs, to help with any holes or projects people mite be working on." + desc = "This crate contains sixteen RCD compressed matter packs, to help with any holes or projects people might be working on." cost = 3750 contains = list(/obj/item/rcd_ammo, /obj/item/rcd_ammo, @@ -109,6 +129,18 @@ /obj/item/rcd_ammo) crate_name = "rcd ammo" +/datum/supply_pack/materials/loom + name = "Loom" + desc = "A large pre-made loom." + cost = 1000 + contains = list(/obj/structure/loom/unanchored) + crate_name = "loom crate" + crate_type = /obj/structure/closet/crate/large + +////////////////////////////////////////////////////////////////////////////// +///////////////////////////// Canisters ////////////////////////////////////// +////////////////////////////////////////////////////////////////////////////// + /datum/supply_pack/materials/bz name = "BZ Canister Crate" desc = "Contains a canister of BZ. Requires Toxins access to open." @@ -159,6 +191,10 @@ crate_name = "water vapor canister crate" crate_type = /obj/structure/closet/crate/large +////////////////////////////////////////////////////////////////////////////// +/////////////////////////////// Tanks //////////////////////////////////////// +////////////////////////////////////////////////////////////////////////////// + /datum/supply_pack/materials/fueltank name = "Fuel Tank Crate" desc = "Contains a welding fuel tank. Caution, highly flammable." @@ -191,18 +227,4 @@ crate_name = "high-capacity water tank crate" crate_type = /obj/structure/closet/crate/large -/datum/supply_pack/materials/loom - name = "Loom" - desc = "A large pre-made loom." - cost = 1000 - contains = list(/obj/structure/loom/unanchored) - crate_name = "loom crate" - crate_type = /obj/structure/closet/crate/large -/datum/supply_pack/materials/wooden_barrel - name = "Wooden Barrel" - desc = "Wooden barrels ready for storage." - cost = 1500 - contains = list(/obj/structure/fermenting_barrel) - crate_name = "wooden barrel crate" - crate_type = /obj/structure/closet/crate/large diff --git a/code/modules/cargo/packs/medical.dm b/code/modules/cargo/packs/medical.dm index 44c9958849..1e5097fd11 100644 --- a/code/modules/cargo/packs/medical.dm +++ b/code/modules/cargo/packs/medical.dm @@ -10,6 +10,16 @@ group = "Medical" crate_type = /obj/structure/closet/crate/medical +/datum/supply_pack/medical/bodybags + name = "Bodybags" + desc = "For when the bodies hit the floor. Contains 4 boxes of bodybags." + cost = 1200 + contains = list(/obj/item/storage/box/bodybags, + /obj/item/storage/box/bodybags, + /obj/item/storage/box/bodybags, + /obj/item/storage/box/bodybags,) + crate_name = "bodybag crate" + /datum/supply_pack/medical/firstaidbruises name = "Bruise Treatment Kit Crate" desc = "Contains three first aid kits focused on healing bruises and broken bones." @@ -74,7 +84,7 @@ /datum/supply_pack/science/adv_surgery_tools name = "Med-Co Advanced surgery tools" - desc = "A full set of Med-Co advanced surgery tools, this crate also comes with a spay of synth flesh as well as a can of . Requires Surgery access to open." + desc = "A full set of Med-Co advanced surgery tools! In addition to that it contains both a can of synthflesh and a can of sterilizine. Requires Surgery access to open." cost = 5500 access = ACCESS_SURGERY contains = list(/obj/item/storage/belt/medical/surgery_belt_adv, @@ -85,8 +95,9 @@ /datum/supply_pack/medical/medicalhardsuit name = "Medical Hardsuit" - desc = "Got people being spaced left and right? Hole in the same room as the dead body of Hos or cap? Fear not, now you can buy one medical hardsuit with a mask and air tank to save your fellow crewmembers." + desc = "Got people being spaced left and right? Hole in the same room as the dead body of Hos or cap? Fear not, now you can buy one medical hardsuit with a mask and air tank to save your fellow crewmembers. Requires medical access to open." cost = 2750 + access = ACCESS_MEDICAL contains = list(/obj/item/tank/internals/air, /obj/item/clothing/mask/gas, /obj/item/clothing/suit/space/hardsuit/medical) @@ -163,7 +174,7 @@ /datum/supply_pack/medical/advrad name = "Radiation Treatment Crate Deluxe" - desc = "A crate for when radiation is out of hand... Contains two rad-b-gone kits, one bottle of anti radiation deluxe pill bottle, as well as a radiation treatment deluxe pill bottle!" + desc = "A crate for when radiation is out of hand... Contains two rad-b-gone kits, one bottle of anti radiation deluxe pills, as well as a radiation treatment deluxe pill bottle!" cost = 3500 contains = list(/obj/item/storage/pill_bottle/antirad_plus, /obj/item/storage/pill_bottle/mutarad, @@ -215,3 +226,23 @@ crate_name = "virus crate" crate_type = /obj/structure/closet/crate/secure/plasma dangerous = TRUE + +/datum/supply_pack/medical/anitvirus + name = "Virus Containment Crate" + desc = "Viro let out a death plague Mk II again? Someone didnt wash their hands? Old plagues born anew? Well this crate is for you! Hope you cure it before it breaks out of the station... This crate needs medical access to open and has two bio suits, a box of needles and beakers, five spaceacillin needles, and a medibot." + cost = 3000 + access = ACCESS_MEDICAL + contains = list(/mob/living/simple_animal/bot/medbot, + /obj/item/clothing/head/bio_hood, + /obj/item/clothing/head/bio_hood, + /obj/item/clothing/suit/bio_suit, + /obj/item/clothing/suit/bio_suit, + /obj/item/reagent_containers/syringe/antiviral, + /obj/item/reagent_containers/syringe/antiviral, + /obj/item/reagent_containers/syringe/antiviral, + /obj/item/reagent_containers/syringe/antiviral, + /obj/item/reagent_containers/syringe/antiviral, + /obj/item/storage/box/syringes, + /obj/item/storage/box/beakers) + crate_name = "virus containment unit crate" + crate_type = /obj/structure/closet/crate/secure/plasma \ No newline at end of file diff --git a/code/modules/cargo/packs/misc.dm b/code/modules/cargo/packs/misc.dm index 5945a454b2..aa680e1b1e 100644 --- a/code/modules/cargo/packs/misc.dm +++ b/code/modules/cargo/packs/misc.dm @@ -9,6 +9,21 @@ /datum/supply_pack/misc group = "Miscellaneous Supplies" +////////////////////////////////////////////////////////////////////////////// +//////////////////// Paperwork and Writing Supplies ////////////////////////// +////////////////////////////////////////////////////////////////////////////// + +/* I did it Kevin +/datum/supply_pack/misc/abandonedcrate + name = "Abandoned Crate" + desc = "Someone keeps finding these locked crates out in the boonies. How about you take a crack at it, we've had our fill. WARNING: EXPLOSIVE" + contraband = TRUE + cost = 12800 + contains = list(/obj/structure/closet/crate/secure/loot) + crate_name = "abandoned crate" + crate_type = /obj/structure/closet/crate/large + dangerous = TRUE +*/ /datum/supply_pack/misc/artsupply name = "Art Supplies" desc = "Make some happy little accidents with six canvasses, two easels, two boxes of crayons, and a rainbow crayon!" @@ -29,39 +44,6 @@ crate_name = "art supply crate" crate_type = /obj/structure/closet/crate/wooden -/datum/supply_pack/misc/captain_pen - name = "Captain Pen" - desc = "A spare Captain fountain pen." - access = ACCESS_CAPTAIN - cost = 10000 - contains = list(/obj/item/pen/fountain/captain) - crate_name = "captain pen" - crate_type = /obj/structure/closet/crate/secure/weapon //It is a combat pen - -/datum/supply_pack/misc/bicycle - name = "Bicycle" - desc = "Nanotrasen reminds all employees to never toy with powers outside their control." - cost = 1000000 - contains = list(/obj/vehicle/ridden/bicycle) - crate_name = "Bicycle Crate" - crate_type = /obj/structure/closet/crate/large - -/datum/supply_pack/misc/bigband - name = "Big Band Instrument Collection" - desc = "Get your sad station movin' and groovin' with this fine collection! Contains nine different instruments!" - cost = 5000 - crate_name = "Big band musical instruments collection" - contains = list(/obj/item/instrument/violin, - /obj/item/instrument/guitar, - /obj/item/instrument/glockenspiel, - /obj/item/instrument/accordion, - /obj/item/instrument/saxophone, - /obj/item/instrument/trombone, - /obj/item/instrument/recorder, - /obj/item/instrument/harmonica, - /obj/structure/piano/unanchored) - crate_type = /obj/structure/closet/crate/wooden - /datum/supply_pack/misc/book_crate name = "Book Crate" desc = "Surplus from the Nanotrasen Archives, these five books are sure to be good reads." @@ -98,6 +80,15 @@ /obj/item/storage/briefcase) crate_name = "bureaucracy crate" +/datum/supply_pack/misc/captain_pen + name = "Captain Pen" + desc = "A spare Captain fountain pen." + access = ACCESS_CAPTAIN + cost = 10000 + contains = list(/obj/item/pen/fountain/captain) + crate_name = "captain pen" + crate_type = /obj/structure/closet/crate/secure/weapon //It is a combat pen + /datum/supply_pack/misc/fountainpens name = "Calligraphy Crate" desc = "Sign death warrants in style with these seven executive fountain pens." @@ -107,14 +98,6 @@ crate_type = /obj/structure/closet/crate/wooden crate_name = "calligraphy crate" -/datum/supply_pack/misc/wrapping_paper - name = "Festive Wrapping Paper Crate" - desc = "Want to mail your loved ones gift-wrapped chocolates, stuffed animals, the Clown's severed head? You can do all that, with this crate full of wrapping paper." - cost = 1000 - contains = list(/obj/item/stack/wrapping_paper) - crate_type = /obj/structure/closet/crate/wooden - crate_name = "festive wrapping paper crate" - /datum/supply_pack/misc/paper_work name = "Freelance Paper work" desc = "The Nanotrasen Primary Bureaucratic Database Intelligence (PDBI) reports that the station has not completed its funding and grant paperwork this solar cycle. In order to gain further funding, your station is required to fill out (20) ten of these forms or no additional capital will be disbursed. We have sent you ten copies of the following form and we expect every one to be up to Nanotrasen Standards." // Disbursement. It's not a typo, look it up. @@ -143,16 +126,134 @@ ) crate_name = "Paperwork" -/datum/supply_pack/misc/funeral - name = "Funeral Supply crate" - desc = "At the end of the day, someone's gonna want someone dead. Give them a proper send-off with these funeral supplies! Contains a coffin with burial garmets and flowers." - cost = 800 - contains = list(/obj/item/clothing/under/burial, - /obj/item/reagent_containers/food/snacks/grown/harebell, - /obj/item/reagent_containers/food/snacks/grown/poppy/geranium - ) - crate_name = "coffin" - crate_type = /obj/structure/closet/crate/coffin +////////////////////////////////////////////////////////////////////////////// +//////////////////////////////// Entertainment /////////////////////////////// +////////////////////////////////////////////////////////////////////////////// + +/datum/supply_pack/misc/randombedsheets + name = "Bedsheet Crate (R)" + desc = "Snuggle up in some sweet sheets with this assorted bedsheet crate. Each set comes with eight random bedsheets for your slumbering pleasure!" + cost = 2000 + contains = list(/obj/item/bedsheet/random, + /obj/item/bedsheet/random, + /obj/item/bedsheet/random, + /obj/item/bedsheet/random, + /obj/item/bedsheet/random, + /obj/item/bedsheet/random, + /obj/item/bedsheet/random, + /obj/item/bedsheet/random) //I'm lazy, and I copy paste stuff. + crate_name = "random bedsheet crate" + +/datum/supply_pack/misc/coloredsheets + name = "Bedsheet Crate (C)" + desc = "Give your night life a splash of color with this crate filled with bedsheets! Contains a total of nine different-colored sheets." + cost = 1250 + contains = list(/obj/item/bedsheet/blue, + /obj/item/bedsheet/green, + /obj/item/bedsheet/orange, + /obj/item/bedsheet/purple, + /obj/item/bedsheet/red, + /obj/item/bedsheet/yellow, + /obj/item/bedsheet/brown, + /obj/item/bedsheet/black, + /obj/item/bedsheet/rainbow) + crate_name = "colored bedsheet crate" + +/datum/supply_pack/misc/bicycle + name = "Bicycle" + desc = "Nanotrasen reminds all employees to never toy with powers outside their control." + cost = 1000000 + contains = list(/obj/vehicle/ridden/bicycle) + crate_name = "Bicycle Crate" + crate_type = /obj/structure/closet/crate/large + +/datum/supply_pack/misc/bigband + name = "Big Band Instrument Collection" + desc = "Get your sad station movin' and groovin' with this fine collection! Contains nine different instruments!" + cost = 5000 + crate_name = "Big band musical instruments collection" + contains = list(/obj/item/instrument/violin, + /obj/item/instrument/guitar, + /obj/item/instrument/glockenspiel, + /obj/item/instrument/accordion, + /obj/item/instrument/saxophone, + /obj/item/instrument/trombone, + /obj/item/instrument/recorder, + /obj/item/instrument/harmonica, + /obj/structure/piano/unanchored) + crate_type = /obj/structure/closet/crate/wooden + +/datum/supply_pack/misc/cbtpack + name = "CBT Equipment" + desc = "(*!&@#CBT is a special term coined by high ranking syndicate operatives for a special form of information extraction. While the training required to use this shipment is highly classified, the distribution of it's contents are not. In addition to this crates unusual contents, we have added a bar of soap.#@*$" + hidden = TRUE + cost = 2400 + contains = list(/mob/living/simple_animal/chicken, + /obj/item/toy/beach_ball/holoball, + /obj/item/melee/baton/cattleprod, + /obj/item/soap/syndie) + crate_name = "cbt crate" + crate_type = /obj/structure/closet/crate/large + +/datum/supply_pack/misc/casinocrate + name = "Casino Crate" + desc = "Start up your own grand casino with this crate filled with slot machine and arcade boards!" + cost = 3000 + contains = list(/obj/item/circuitboard/computer/arcade/battle, + /obj/item/circuitboard/computer/arcade/battle, + /obj/item/circuitboard/computer/arcade/orion_trail, + /obj/item/circuitboard/computer/arcade/orion_trail, + /obj/item/circuitboard/computer/arcade/minesweeper, + /obj/item/circuitboard/computer/arcade/minesweeper, + /obj/item/circuitboard/computer/slot_machine, + /obj/item/circuitboard/computer/slot_machine, + /obj/item/circuitboard/computer/slot_machine, + /obj/item/circuitboard/computer/slot_machine, + /obj/item/circuitboard/computer/slot_machine, + /obj/item/circuitboard/computer/slot_machine) + crate_name = "casino crate" + +/datum/supply_pack/misc/coincrate + name = "Coin Crate" + desc = "Psssst, hey, you. Yes, you. I've heard that coins can do some special things on your station, give you access to some pretty cool stuff. Here's the deal, you give me some credits, and I give so some coins. Sound like a deal? I'll give you 10 for 10000 creds." + contraband = TRUE + cost = 10000 + contains = list(/obj/item/coin/silver) + crate_name = "coin crate" + crate_type = /obj/structure/closet/crate/large + +/datum/supply_pack/misc/coincrate/generate() + . = ..() + for(var/i in 1 to 9) + new /obj/item/coin/silver(.) + +////////////////////////////////////////////////////////////////////////////// +//////////////////////////////// Misc Supplies /////////////////////////////// +////////////////////////////////////////////////////////////////////////////// + +/datum/supply_pack/misc/exoticfootwear + name = "Exotic Footwear Crate" + desc = "Popularised by lizards and exotic dancers, the footwear included in this shipment is sure to give your feet the breathing room they deserve. Sweet Kicks Inc. is not responsible for any damage, distress, or @r0u$a1 caused by this shipment." + cost = 4337 + contains = list(/obj/item/clothing/shoes/wraps, + /obj/item/clothing/shoes/wraps, + /obj/item/clothing/shoes/wraps/silver, + /obj/item/clothing/shoes/wraps/silver, + /obj/item/clothing/shoes/wraps/red, + /obj/item/clothing/shoes/wraps/red, + /obj/item/clothing/shoes/wraps/blue, + /obj/item/clothing/shoes/wraps/blue, + /obj/item/clothing/shoes/clown_shoes, + /obj/item/clothing/shoes/kindleKicks) + crate_name = "footie crate" + +/datum/supply_pack/misc/wrapping_paper + name = "Festive Wrapping Paper Crate" + desc = "Want to mail your loved ones gift-wrapped chocolates, stuffed animals, or the Clown's severed head? You can do all that, with this crate full of wrapping paper." + cost = 1000 + contains = list(/obj/item/stack/wrapping_paper) + crate_type = /obj/structure/closet/crate/wooden + crate_name = "festive wrapping paper crate" /datum/supply_pack/misc/jukebox name = "Jukebox" @@ -160,9 +261,147 @@ contains = list(/obj/machinery/jukebox) crate_name = "Jukebox" +/datum/supply_pack/misc/potted_plants + name = "Potted Plants Crate" + desc = "Spruce up the station with these lovely plants! Contains a random assortment of five potted plants from Nanotrasen's potted plant research division. Warranty void if thrown." + cost = 730 + contains = list(/obj/item/twohanded/required/kirbyplants/random, + /obj/item/twohanded/required/kirbyplants/random, + /obj/item/twohanded/required/kirbyplants/random, + /obj/item/twohanded/required/kirbyplants/random, + /obj/item/twohanded/required/kirbyplants/random) + crate_name = "potted plants crate" + crate_type = /obj/structure/closet/crate/hydroponics + +/datum/supply_pack/misc/religious_supplies + name = "Religious Supplies Crate" + desc = "Keep your local chaplain happy and well-supplied, lest they call down judgement upon your cargo bay. Contains two bottles of holywater, bibles, chaplain robes, and burial garmets." + cost = 4000 // it costs so much because the Space Church is ran by Space Jews + contains = list(/obj/item/reagent_containers/food/drinks/bottle/holywater, + /obj/item/reagent_containers/food/drinks/bottle/holywater, + /obj/item/storage/book/bible/booze, + /obj/item/storage/book/bible/booze, + /obj/item/clothing/suit/hooded/chaplain_hoodie, + /obj/item/clothing/suit/hooded/chaplain_hoodie + ) + crate_name = "religious supplies crate" + +/datum/supply_pack/misc/funeral + name = "Funeral Supplies" + desc = "Mourn your dead properly buy sending them off with love filled notes, clean clothes, and a proper ceremony. Contains two candle packs, funeral garb, flowers, a paperbin , and crayons to help aid in religious rituals. Coffin included." + cost = 1200 + contains = list(/obj/item/clothing/under/burial, + /obj/item/storage/fancy/candle_box, + /obj/item/storage/fancy/candle_box, + /obj/item/reagent_containers/food/snacks/grown/harebell, + /obj/item/reagent_containers/food/snacks/grown/harebell, + /obj/item/reagent_containers/food/snacks/grown/poppy/geranium, + /obj/item/reagent_containers/food/snacks/grown/poppy/geranium, + /obj/item/reagent_containers/food/snacks/grown/poppy/lily, + /obj/item/reagent_containers/food/snacks/grown/poppy/lily, + /obj/item/storage/crayons, + /obj/item/paper_bin + ) + crate_name = "coffin" + crate_type = /obj/structure/closet/crate/coffin + +/datum/supply_pack/misc/shower + name = "Shower Supplies" + desc = "Everyone needs a bit of R&R. Make sure you get can get yours by ordering this crate filled with towels, rubber duckies, and some soap!" + cost = 1000 + contains = list(/obj/item/reagent_containers/rag/towel, + /obj/item/reagent_containers/rag/towel, + /obj/item/reagent_containers/rag/towel, + /obj/item/reagent_containers/rag/towel, + /obj/item/reagent_containers/rag/towel, + /obj/item/reagent_containers/rag/towel, + /obj/item/bikehorn/rubberducky, + /obj/item/bikehorn/rubberducky, + /obj/item/soap/nanotrasen) + crate_name = "shower crate" + +////////////////////////////////////////////////////////////////////////////// +//////////////////////////// Misc + Decor //////////////////////////////////// +////////////////////////////////////////////////////////////////////////////// + +/datum/supply_pack/misc/carpet_exotic + name = "Exotic Carpet Crate" + desc = "Exotic carpets straight from Space Russia, for all your decorating needs. Contains 100 tiles each of 10 different flooring patterns." + cost = 7000 + contains = list(/obj/item/stack/tile/carpet/blue/fifty, + /obj/item/stack/tile/carpet/blue/fifty, + /obj/item/stack/tile/carpet/cyan/fifty, + /obj/item/stack/tile/carpet/cyan/fifty, + /obj/item/stack/tile/carpet/green/fifty, + /obj/item/stack/tile/carpet/green/fifty, + /obj/item/stack/tile/carpet/orange/fifty, + /obj/item/stack/tile/carpet/orange/fifty, + /obj/item/stack/tile/carpet/purple/fifty, + /obj/item/stack/tile/carpet/purple/fifty, + /obj/item/stack/tile/carpet/red/fifty, + /obj/item/stack/tile/carpet/red/fifty, + /obj/item/stack/tile/carpet/royalblue/fifty, + /obj/item/stack/tile/carpet/royalblue/fifty, + /obj/item/stack/tile/carpet/royalblack/fifty, + /obj/item/stack/tile/carpet/royalblack/fifty, + /obj/item/stack/tile/carpet/blackred/fifty, + /obj/item/stack/tile/carpet/blackred/fifty, + /obj/item/stack/tile/carpet/monochrome/fifty, + /obj/item/stack/tile/carpet/monochrome/fifty) + crate_name = "exotic carpet crate" + +/datum/supply_pack/misc/carpet + name = "Premium Carpet Crate" + desc = "Plasteel floor tiles getting on your nerves? These stacks of extra soft carpet will tie any room together. Contains some classic carpet, along with black, red, and monochrome varients." + cost = 1350 + contains = list(/obj/item/stack/tile/carpet/fifty, + /obj/item/stack/tile/carpet/fifty, + /obj/item/stack/tile/carpet/black/fifty, + /obj/item/stack/tile/carpet/black/fifty, + /obj/item/stack/tile/carpet/blackred/fifty, + /obj/item/stack/tile/carpet/blackred/fifty, + /obj/item/stack/tile/carpet/monochrome/fifty, + /obj/item/stack/tile/carpet/monochrome/fifty) + crate_name = "premium carpet crate" + +/datum/supply_pack/misc/party + name = "Party Equipment" + desc = "Celebrate both life and death on the station with Nanotrasen's Party Essentials(tm)! Contains seven colored glowsticks, four beers, two ales, a drinking shaker, and a bottle of patron & goldschlager!" + cost = 2000 + contains = list(/obj/item/storage/box/drinkingglasses, + /obj/item/reagent_containers/food/drinks/shaker, + /obj/item/reagent_containers/food/drinks/bottle/patron, + /obj/item/reagent_containers/food/drinks/bottle/goldschlager, + /obj/item/reagent_containers/food/drinks/ale, + /obj/item/reagent_containers/food/drinks/ale, + /obj/item/reagent_containers/food/drinks/beer, + /obj/item/reagent_containers/food/drinks/beer, + /obj/item/reagent_containers/food/drinks/beer, + /obj/item/reagent_containers/food/drinks/beer, + /obj/item/flashlight/glowstick, + /obj/item/flashlight/glowstick/red, + /obj/item/flashlight/glowstick/blue, + /obj/item/flashlight/glowstick/cyan, + /obj/item/flashlight/glowstick/orange, + /obj/item/flashlight/glowstick/yellow, + /obj/item/flashlight/glowstick/pink) + crate_name = "party equipment crate" + +/datum/supply_pack/misc/noslipfloor + name = "High-traction Floor Tiles" + desc = "Make slipping a thing of the past with sixty industrial-grade anti-slip floortiles!" + cost = 2000 + contains = list(/obj/item/stack/tile/noslip/thirty, + /obj/item/stack/tile/noslip/thirty) + crate_name = "high-traction floor tiles crate" + +////////////////////////////////////////////////////////////////////////////// +//////////////////////////////// Lewd Supplies /////////////////////////////// +////////////////////////////////////////////////////////////////////////////// + /datum/supply_pack/misc/lewd name = "Lewd Crate" // OwO - desc = "Psss want to have a good time with your sluts? Well I got what you want maid clothing, dildos, collars and more!" + desc = "Pssst, want to have a good time with your sluts? Well I got what you want! Maid clothing, dildos, collars and more!" cost = 5250 contraband = TRUE contains = list(/obj/item/dildo/custom, @@ -191,27 +430,4 @@ crate_name = "deluxe keg" crate_type = /obj/structure/closet/crate -/datum/supply_pack/misc/religious_supplies - name = "Religious Supplies Crate" - desc = "Keep your local chaplain happy and well-supplied, lest they call down judgement upon your cargo bay. Contains two bottles of holywater, bibles, chaplain robes, and burial garmets." - cost = 4000 // it costs so much because the Space Church is ran by Space Jews - contains = list(/obj/item/reagent_containers/food/drinks/bottle/holywater, - /obj/item/reagent_containers/food/drinks/bottle/holywater, - /obj/item/storage/book/bible/booze, - /obj/item/storage/book/bible/booze, - /obj/item/clothing/suit/hooded/chaplain_hoodie, - /obj/item/clothing/suit/hooded/chaplain_hoodie - ) - crate_name = "religious supplies crate" -/datum/supply_pack/misc/toner - name = "Toner Crate" - desc = "Spent too much ink printing butt pictures? Fret not, with these six toner refills, you'll be printing butts 'till the cows come home!'" - cost = 1000 - contains = list(/obj/item/toner, - /obj/item/toner, - /obj/item/toner, - /obj/item/toner, - /obj/item/toner, - /obj/item/toner) - crate_name = "toner crate" diff --git a/code/modules/cargo/packs/organic.dm b/code/modules/cargo/packs/organic.dm index 78f10b0908..4a90af6fd0 100644 --- a/code/modules/cargo/packs/organic.dm +++ b/code/modules/cargo/packs/organic.dm @@ -10,35 +10,13 @@ group = "Food & Hydroponics" crate_type = /obj/structure/closet/crate/freezer -/datum/supply_pack/organic/hydroponics/beekeeping_suits - name = "Beekeeper Suit Crate" - desc = "Bee business booming? Better be benevolent and boost botany by bestowing bi-Beekeeper-suits! Contains two beekeeper suits and matching headwear." - cost = 1300 - contains = list(/obj/item/clothing/head/beekeeper_head, - /obj/item/clothing/suit/beekeeper_suit, - /obj/item/clothing/head/beekeeper_head, - /obj/item/clothing/suit/beekeeper_suit) - crate_name = "beekeeper suits" - crate_type = /obj/structure/closet/crate/hydroponics - -/datum/supply_pack/organic/hydroponics/beekeeping_fullkit - name = "Beekeeping Starter Crate" - desc = "BEES BEES BEES. Contains three honey frames, a beekeeper suit and helmet, flyswatter, bee house, and, of course, a pure-bred Nanotrasen-Standardized Queen Bee!" - cost = 1800 - contains = list(/obj/structure/beebox/unwrenched, - /obj/item/honey_frame, - /obj/item/honey_frame, - /obj/item/honey_frame, - /obj/item/queen_bee/bought, - /obj/item/clothing/head/beekeeper_head, - /obj/item/clothing/suit/beekeeper_suit, - /obj/item/melee/flyswatter) - crate_name = "beekeeping starter crate" - crate_type = /obj/structure/closet/crate/hydroponics +////////////////////////////////////////////////////////////////////////////// +/////////////////////////////// Food ///////////////////////////////////////// +////////////////////////////////////////////////////////////////////////////// /datum/supply_pack/organic/candy/randomised name = "Candy Crate" - desc = "For people that have a insatiable sweet tooth! Has ten candies to be eaten up.." + desc = "For people that have an insatiable sweet tooth! Has ten candies to be eaten up.." cost = 2500 var/num_contained = 10 //number of items picked to be contained in a randomised crate contains = list(/obj/item/reagent_containers/food/snacks/candy, @@ -82,6 +60,7 @@ /obj/item/seeds/amanita, /obj/item/seeds/reishi, /obj/item/seeds/banana, + /obj/item/seeds/bamboo, /obj/item/seeds/eggplant/eggy, /obj/item/seeds/random, /obj/item/seeds/random) @@ -90,7 +69,7 @@ /datum/supply_pack/organic/food name = "Food Crate" - desc = "Get things cooking with this crate full of useful ingredients! Contains a two dozen eggs, three bananas, and two bags of flour and rice, two cartons of milk, soymilk, as well as salt and pepper shakers, a enzyme and sugar bottle, and three slabs of monkeymeat." + desc = "Get things cooking with this crate full of useful ingredients! Contains a two dozen eggs, three bananas, and two bags of flour and rice, two cartons of milk, soymilk, as well as salt and pepper shakers, an enzyme and sugar bottle, and three slabs of monkeymeat." cost = 1000 contains = list(/obj/item/reagent_containers/food/condiment/flour, /obj/item/reagent_containers/food/condiment/flour, @@ -113,6 +92,24 @@ /obj/item/reagent_containers/food/snacks/grown/banana) crate_name = "food crate" +/datum/supply_pack/organic/fiestatortilla + name = "Fiesta Crate" + desc = "Spice up the kitchen with this fiesta themed food order! Contains 8 tortilla based food items, as well as a sombrero, moustache, and cloak!" + cost = 2750 + contains = list(/obj/item/clothing/head/sombrero, + /obj/item/clothing/suit/hooded/cloak/david, + /obj/item/clothing/mask/fakemoustache, + /obj/item/reagent_containers/food/snacks/taco, + /obj/item/reagent_containers/food/snacks/taco, + /obj/item/reagent_containers/food/snacks/taco/plain, + /obj/item/reagent_containers/food/snacks/taco/plain, + /obj/item/reagent_containers/food/snacks/enchiladas, + /obj/item/reagent_containers/food/snacks/enchiladas, + /obj/item/reagent_containers/food/snacks/carneburrito, + /obj/item/reagent_containers/food/snacks/cheesyburrito, + /obj/item/reagent_containers/glass/bottle/capsaicin, + /obj/item/reagent_containers/glass/bottle/capsaicin) + crate_name = "fiesta crate" /datum/supply_pack/organic/fruit_1 name = "Fruit Basic Crate" @@ -140,7 +137,7 @@ /datum/supply_pack/organic/fruit_2 name = "Fruit Delux Crate" - desc = "Getting tired of the basic fruits and want to have something a bit more decadent! This crate is for you! Contains three of each - bunches of berries, apples, pineapples, cherries, green & red grapes, eggplants, bananas lastly ten strawberry." + desc = "Getting tired of the basic fruits and want to have something a bit more decadent! This crate is for you! Contains three of each - bunches of berries, apples, pineapples, cherries, green & red grapes, eggplants, bananas, peaches, and lastly seven strawberry. Includes one serving tray." cost = 3500 contains = list(/obj/item/reagent_containers/food/snacks/grown/berries, /obj/item/reagent_containers/food/snacks/grown/berries, @@ -166,6 +163,9 @@ /obj/item/reagent_containers/food/snacks/grown/eggplant, /obj/item/reagent_containers/food/snacks/grown/eggplant, /obj/item/reagent_containers/food/snacks/grown/eggplant, + /obj/item/reagent_containers/food/snacks/grown/peach, + /obj/item/reagent_containers/food/snacks/grown/peach, + /obj/item/reagent_containers/food/snacks/grown/peach, /obj/item/reagent_containers/food/snacks/grown/strawberry, /obj/item/reagent_containers/food/snacks/grown/strawberry, /obj/item/reagent_containers/food/snacks/grown/strawberry, @@ -173,11 +173,26 @@ /obj/item/reagent_containers/food/snacks/grown/strawberry, /obj/item/reagent_containers/food/snacks/grown/strawberry, /obj/item/reagent_containers/food/snacks/grown/strawberry, - /obj/item/reagent_containers/food/snacks/grown/strawberry, - /obj/item/reagent_containers/food/snacks/grown/strawberry, - /obj/item/reagent_containers/food/snacks/grown/strawberry) + /obj/item/storage/bag/tray) crate_name = "fruit crate" +/datum/supply_pack/organic/grill + name = "Grilling Starter Kit" + desc = "Hey dad I'm Hungry. Hi Hungry I'm THE NEW GRILLING STARTER KIT ONLY 5000 BUX GET NOW! Contains a cooking grill and five fuel coal sheets." + cost = 3000 + crate_type = /obj/structure/closet/crate + contains = list(/obj/item/stack/sheet/mineral/coal/five, + /obj/machinery/grill/unwrenched) + crate_name = "grilling starter kit crate" + +/datum/supply_pack/organic/grillfuel + name = "Grilling Fuel Kit" + desc = "Contains coal and coal accessories. (Note: only ten coal sheets.)" + cost = 1000 + crate_type = /obj/structure/closet/crate + contains = list(/obj/item/stack/sheet/mineral/coal/ten) + crate_name = "grilling fuel kit crate" + /datum/supply_pack/organic/cream_piee name = "High-yield Clown-grade Cream Pie Crate" desc = "Designed by Aussec's Advanced Warfare Research Division, these high-yield, Clown-grade cream pies are powered by a synergy of performance and efficiency. Guaranteed to provide maximum results." @@ -188,84 +203,51 @@ access = ACCESS_THEATRE crate_type = /obj/structure/closet/crate/secure -/datum/supply_pack/organic/hunting - name = "Huntting gear" - desc = "Even in space, we can fine prey to hunt, this crate contains everthing a fine hunter needs to have a sporting time. This crate needs armory access to open. A true huntter only needs a fine bottle of cognac, a nice coat, some good o' cigars, and of cource a huntting shotgun. " - cost = 3500 +/datum/supply_pack/organic/fakemeat + name = "Meat Crate" + desc = "Run outta meat already? Keep the lizards content with this freezer filled with cruelty-free chemically compounded meat! Contains 12 slabs of meat product, and 4 slabs of *carp*." + cost = 1200 // Buying 3 food crates nets you 9 meat for 900 points, plus like, 6 bags of rice, flour, and egg boxes. This is 12 for 500, but you -only- get meat and carp. + contains = list(/obj/item/reagent_containers/food/snacks/meat/slab/meatproduct, + /obj/item/reagent_containers/food/snacks/meat/slab/meatproduct, + /obj/item/reagent_containers/food/snacks/meat/slab/meatproduct, + /obj/item/reagent_containers/food/snacks/meat/slab/meatproduct, + /obj/item/reagent_containers/food/snacks/meat/slab/meatproduct, + /obj/item/reagent_containers/food/snacks/meat/slab/meatproduct, + /obj/item/reagent_containers/food/snacks/meat/slab/meatproduct, + /obj/item/reagent_containers/food/snacks/meat/slab/meatproduct, + /obj/item/reagent_containers/food/snacks/meat/slab/meatproduct, + /obj/item/reagent_containers/food/snacks/meat/slab/meatproduct, + /obj/item/reagent_containers/food/snacks/meat/slab/meatproduct, + /obj/item/reagent_containers/food/snacks/meat/slab/meatproduct, + /obj/item/reagent_containers/food/snacks/carpmeat/imitation, + /obj/item/reagent_containers/food/snacks/carpmeat/imitation, + /obj/item/reagent_containers/food/snacks/carpmeat/imitation, + /obj/item/reagent_containers/food/snacks/carpmeat/imitation) + crate_name = "meaty crate" + crate_type = /obj/structure/closet/crate/freezer + +/datum/supply_pack/organic/monkeydripmeat + name = "*Meat* Crate" + desc = "Need some meat? With this do-it-yourself kit you'll be swimming in it! Contains a monkey cube, an IV drip, and some cryoxadone!" + cost = 2150 contraband = TRUE - contains = list(/obj/item/clothing/head/flatcap, - /obj/item/clothing/suit/hooded/wintercoat/captain, - /obj/item/reagent_containers/food/drinks/bottle/cognac, - /obj/item/storage/fancy/cigarettes/cigars/havana, - /obj/item/clothing/gloves/color/white, - /obj/item/clothing/under/rank/curator, - /obj/item/gun/ballistic/shotgun/lethal) - access = ACCESS_ARMORY - crate_name = "sporting crate" - crate_type = /obj/structure/closet/crate/secure // Would have liked a wooden crate but access >:( + contains = list(/obj/item/reagent_containers/food/snacks/monkeycube, + /obj/item/restraints/handcuffs/cable, + /obj/machinery/iv_drip, + /obj/item/reagent_containers/glass/beaker/cryoxadone, + /obj/item/reagent_containers/glass/beaker/cryoxadone) + crate_name = "monkey meat crate" -/datum/supply_pack/organic/hydroponics - name = "Hydroponics Crate" - desc = "Supplies for growing a great garden! Contains two bottles of ammonia, two Plant-B-Gone spray bottles, a hatchet, cultivator, plant analyzer, as well as a pair of leather gloves and a botanist's apron." - cost = 1750 - contains = list(/obj/item/reagent_containers/spray/plantbgone, - /obj/item/reagent_containers/spray/plantbgone, - /obj/item/reagent_containers/glass/bottle/ammonia, - /obj/item/reagent_containers/glass/bottle/ammonia, - /obj/item/hatchet, - /obj/item/cultivator, - /obj/item/plant_analyzer, - /obj/item/clothing/gloves/botanic_leather, - /obj/item/clothing/suit/apron) - crate_name = "hydroponics crate" - crate_type = /obj/structure/closet/crate/hydroponics - -/datum/supply_pack/organic/hydroponics/hydrotank - name = "Hydroponics Backpack Crate" - desc = "Bring on the flood with this high-capacity backpack crate. Contains 500 units of life-giving H2O. Requires hydroponics access to open." - cost = 1200 - access = ACCESS_HYDROPONICS - contains = list(/obj/item/watertank) - crate_name = "hydroponics backpack crate" - crate_type = /obj/structure/closet/crate/secure - -/datum/supply_pack/organic/cutlery - name = "Kitchen Cutlery Deluxe Set" - desc = "Need to slice and dice away those ''Tomatos'' well we got what you need! From a nice set of knifes, forks, plates, glasses, and a whetstone for when you got some grizzle that is a bit harder to slice then normal." - cost = 10000 - contraband = TRUE - contains = list(/obj/item/sharpener, - /obj/item/kitchen/fork, - /obj/item/kitchen/fork, - /obj/item/kitchen/knife, - /obj/item/kitchen/knife, - /obj/item/kitchen/knife, - /obj/item/kitchen/knife, - /obj/item/kitchen/knife/butcher, - /obj/item/kitchen/knife/butcher, - /obj/item/kitchen/rollingpin, //Deluxe for a reason - /obj/item/trash/plate, - /obj/item/trash/plate, - /obj/item/trash/plate, - /obj/item/trash/plate, - /obj/item/reagent_containers/food/drinks/drinkingglass, - /obj/item/reagent_containers/food/drinks/drinkingglass, - /obj/item/reagent_containers/food/drinks/drinkingglass, - /obj/item/reagent_containers/food/drinks/drinkingglass/shotglass, - /obj/item/reagent_containers/food/drinks/drinkingglass/shotglass) - crate_name = "kitchen cutlery deluxe set" - -/datum/supply_pack/organic/mre - name = "MRE supply kit (emergency rations)" - desc = "The lights are out. Oxygen's running low. You've run out of food except space weevils. Don't let this be you! Order our NT branded MRE kits today! This pack contains 5 MRE packs with a randomized menu and an oxygen tank." - cost = 2000 - contains = list(/obj/item/storage/box/mre/menu1/safe, - /obj/item/storage/box/mre/menu1/safe, - /obj/item/storage/box/mre/menu2/safe, - /obj/item/storage/box/mre/menu2/safe, - /obj/item/storage/box/mre/menu3, - /obj/item/storage/box/mre/menu4/safe) - crate_name = "MRE crate (emergency rations)" +/datum/supply_pack/organic/mixedboxes + name = "Mixed Ingredient Boxes" + desc = "Get overwhelmed with inspiration by ordering these boxes of surprise ingredients! Get four boxes filled with an assortment of products!" + cost = 2300 + contains = list(/obj/item/storage/box/ingredients/wildcard, + /obj/item/storage/box/ingredients/wildcard, + /obj/item/storage/box/ingredients/wildcard, + /obj/item/storage/box/ingredients/wildcard) + crate_name = "wildcard food crate" + crate_type = /obj/structure/closet/crate/freezer /datum/supply_pack/organic/pizza name = "Pizza Crate" @@ -301,16 +283,105 @@ considered \[REDACTED\] and returned at your leisure. Note that objects the anomaly produces are specifically attuned exactly to the individual opening the anomaly; regardless \ of species, the individual will find the object edible and it will taste great according to their personal definitions, which vary significantly based on person and species.") -/datum/supply_pack/organic/potted_plants - name = "Potted Plants Crate" - desc = "Spruce up the station with these lovely plants! Contains a random assortment of five potted plants from Nanotrasen's potted plant research division. Warranty void if thrown." - cost = 730 - contains = list(/obj/item/twohanded/required/kirbyplants/random, - /obj/item/twohanded/required/kirbyplants/random, - /obj/item/twohanded/required/kirbyplants/random, - /obj/item/twohanded/required/kirbyplants/random, - /obj/item/twohanded/required/kirbyplants/random) - crate_name = "potted plants crate" + +////////////////////////////////////////////////////////////////////////////// +//////////////////////////// Hydroponics ///////////////////////////////////// +////////////////////////////////////////////////////////////////////////////// + +/datum/supply_pack/organic/hydroponics/beekeeping_suits + name = "Beekeeper Suit Crate" + desc = "Bee business booming? Better be benevolent and boost botany by bestowing bi-Beekeeper-suits! Contains two beekeeper suits and matching headwear." + cost = 1300 + contains = list(/obj/item/clothing/head/beekeeper_head, + /obj/item/clothing/suit/beekeeper_suit, + /obj/item/clothing/head/beekeeper_head, + /obj/item/clothing/suit/beekeeper_suit) + crate_name = "beekeeper suits" + crate_type = /obj/structure/closet/crate/hydroponics + +/datum/supply_pack/organic/hydroponics/beekeeping_fullkit + name = "Beekeeping Starter Crate" + desc = "BEES BEES BEES. Contains three honey frames, a beekeeper suit & helmet, flyswatter, bee house, and, of course, a pure-bred Nanotrasen-Standardized Queen Bee!" + cost = 1800 + contains = list(/obj/structure/beebox/unwrenched, + /obj/item/honey_frame, + /obj/item/honey_frame, + /obj/item/honey_frame, + /obj/item/queen_bee/bought, + /obj/item/clothing/head/beekeeper_head, + /obj/item/clothing/suit/beekeeper_suit, + /obj/item/melee/flyswatter) + crate_name = "beekeeping starter crate" + crate_type = /obj/structure/closet/crate/hydroponics + +/datum/supply_pack/organic/exoticseeds + name = "Exotic Seeds Crate" + desc = "Any entrepreneuring botanist's dream. Contains twelve different seeds, including three replica-pod seeds and two mystery seeds!" + cost = 1500 + contains = list(/obj/item/seeds/nettle, + /obj/item/seeds/replicapod, + /obj/item/seeds/replicapod, + /obj/item/seeds/replicapod, + /obj/item/seeds/plump, + /obj/item/seeds/liberty, + /obj/item/seeds/amanita, + /obj/item/seeds/reishi, + /obj/item/seeds/banana, + /obj/item/seeds/eggplant/eggy, + /obj/item/seeds/random, + /obj/item/seeds/random) + crate_name = "exotic seeds crate" + crate_type = /obj/structure/closet/crate/hydroponics + +/* Maintenance Garden Crate basically does this and more. +/datum/supply_pack/organic/hydroponics + name = "Hydroponics Crate" + desc = "Supplies for growing a great garden! Contains two bottles of ammonia, two Plant-B-Gone spray bottles, a hatchet, cultivator, plant analyzer, as well as a pair of leather gloves and a botanist's apron." + cost = 1750 + contains = list(/obj/item/reagent_containers/spray/plantbgone, + /obj/item/reagent_containers/spray/plantbgone, + /obj/item/reagent_containers/glass/bottle/ammonia, + /obj/item/reagent_containers/glass/bottle/ammonia, + /obj/item/hatchet, + /obj/item/cultivator, + /obj/item/plant_analyzer, + /obj/item/clothing/gloves/botanic_leather, + /obj/item/clothing/suit/apron) + crate_name = "hydroponics crate" + crate_type = /obj/structure/closet/crate/hydroponics +*/ +/datum/supply_pack/organic/hydroponics/hydrotank + name = "Hydroponics Backpack Crate" + desc = "Bring on the flood with this high-capacity backpack crate. Contains 500 units of life-giving H2O. Requires hydroponics access to open." + cost = 1200 + access = ACCESS_HYDROPONICS + contains = list(/obj/item/watertank) + crate_name = "hydroponics backpack crate" + crate_type = /obj/structure/closet/crate/secure + +/datum/supply_pack/organic/hydroponics/maintgarden + name = "Maintenance Garden Crate" + desc = "Set up your own tiny paradise with do-it-yourself botany kit. Contains sandstone for dirt plots, pest spray, ammonia, a portable seed generator, basic botanical tools, and some seeds to start off with." + cost = 2700 + contains = list(/obj/item/storage/bag/plants/portaseeder, + /obj/item/reagent_containers/spray/pestspray, + /obj/item/stack/sheet/mineral/sandstone/twelve, + /obj/item/reagent_containers/glass/bucket, + /obj/item/reagent_containers/glass/bottle/ammonia, + /obj/item/reagent_containers/glass/bottle/ammonia, + /obj/item/hatchet, + /obj/item/cultivator, + /obj/item/plant_analyzer, + /obj/item/flashlight, + /obj/item/seeds/carrot, + /obj/item/seeds/carrot, + /obj/item/seeds/tower, + /obj/item/seeds/tower, + /obj/item/seeds/watermelon, + /obj/item/seeds/watermelon, + /obj/item/seeds/grass, + /obj/item/seeds/grass) + crate_name = "maint garden crate" crate_type = /obj/structure/closet/crate/hydroponics /datum/supply_pack/organic/seeds @@ -333,9 +404,29 @@ crate_name = "seeds crate" crate_type = /obj/structure/closet/crate/hydroponics +////////////////////////////////////////////////////////////////////////////// +/////////////////////////////////// Misc ///////////////////////////////////// +////////////////////////////////////////////////////////////////////////////// + +/datum/supply_pack/organic/hunting + name = "Hunting Gear" + desc = "Even in space, we can find prey to hunt, this crate contains everthing a fine hunter needs to have a sporting time. This crate needs armory access to open. A true huntter only needs a fine bottle of cognac, a nice coat, some good o' cigars, and of cource a hunting shotgun. " + cost = 3500 + contraband = TRUE + contains = list(/obj/item/clothing/head/flatcap, + /obj/item/clothing/suit/hooded/wintercoat/captain, + /obj/item/reagent_containers/food/drinks/bottle/cognac, + /obj/item/storage/fancy/cigarettes/cigars/havana, + /obj/item/clothing/gloves/color/white, + /obj/item/clothing/under/rank/curator, + /obj/item/gun/ballistic/shotgun/lethal) + access = ACCESS_ARMORY + crate_name = "sporting crate" + crate_type = /obj/structure/closet/crate/secure // Would have liked a wooden crate but access >:( + /datum/supply_pack/organic/vday name = "Surplus Valentine Crate" - desc = "Turns out we got warehouses of this love-y dove-y crap. Were sending out small barged buddle of Valentine gear. This crate has two boxes of chocolate, three poppy flowers, five candy hearts, and three cards." + desc = "Turns out we got warehouses of this love-y dove-y crap. We're sending out small bargain buddle of Valentine gear. This crate has two boxes of chocolate, three poppy flowers, five candy hearts, and three cards." cost = 3000 contraband = TRUE contains = list(/obj/item/storage/fancy/heart_box, diff --git a/code/modules/cargo/packs/science.dm b/code/modules/cargo/packs/science.dm index 25b8b2ddfb..981e343045 100644 --- a/code/modules/cargo/packs/science.dm +++ b/code/modules/cargo/packs/science.dm @@ -131,7 +131,7 @@ /datum/supply_pack/science/relic name = "Relic Crate" - desc = "Ever want to play with old discounted toys? Look no more. Contains two relics." + desc = "Ever wanted to play with old discounted toys? Look no further. Contains two relics." cost = 1000 contraband = TRUE contains = list(/obj/item/relic, diff --git a/code/modules/cargo/packs/service.dm b/code/modules/cargo/packs/service.dm index 502b81ffcb..8fd5b6eb58 100644 --- a/code/modules/cargo/packs/service.dm +++ b/code/modules/cargo/packs/service.dm @@ -9,117 +9,25 @@ /datum/supply_pack/service group = "Service" -/datum/supply_pack/service/advlighting - name = "Advanced Lighting crate" - desc = "Thanks to advanced lighting tech we here at the Lamp Factory have be able to produce more lamps and lamp items! This crate has three lamps, a box of lights and a state of the art rapid-light-device!" - cost = 2750 - contains = list(/obj/item/construction/rld, - /obj/item/flashlight/lamp, - /obj/item/flashlight/lamp, - /obj/item/flashlight/lamp/green, - /obj/item/storage/box/lights/mixed) - crate_name = "advanced lighting crate" - crate_type = /obj/structure/closet/crate/secure +////////////////////////////////////////////////////////////////////////////// +/////////////////////////////// Cargo //////////////////////////////////////// +////////////////////////////////////////////////////////////////////////////// /datum/supply_pack/service/cargo_supples name = "Cargo Supplies Crate" - desc = "Sold everything that wasn't bolted down? You can get right back to work with this crate containing stamps, an export scanner, destination tagger, hand labeler and some package wrapping." + desc = "Sold everything that wasn't bolted down? You can get right back to work with this crate containing stamps, an export scanner, destination tagger, hand labeler and some package wrapping. Now with extra toner cartidges!" cost = 1000 contains = list(/obj/item/stamp, /obj/item/stamp/denied, /obj/item/export_scanner, /obj/item/destTagger, /obj/item/hand_labeler, + /obj/item/toner, + /obj/item/toner, + /obj/item/stack/packageWrap, /obj/item/stack/packageWrap) crate_name = "cargo supplies crate" -/datum/supply_pack/service/food_cart - name = "Food Cart Crate" - desc = "Want to sell food on the go? Cook lost their cart? Well we just so happen to have a few carts to spare!" - cost = 1000 - contains = list(/obj/machinery/food_cart) - crate_name = "food cart crate" - crate_type = /obj/structure/closet/crate - -/datum/supply_pack/service/noslipfloor - name = "High-traction Floor Tiles" - desc = "Make slipping a thing of the past with sixty industrial-grade anti-slip floortiles!" - cost = 2000 - contains = list(/obj/item/stack/tile/noslip/thirty, - /obj/item/stack/tile/noslip/thirty) - crate_name = "high-traction floor tiles crate" - -/datum/supply_pack/service/icecream_cart - name = "Ice Cream Cart Crate" - desc = "Plasma fire a to hot for you, want a nice treat after a hard days work? Well now we have the cart for you! This Ice Cream Vat has everthing you need to make you and your friends so ice cream treats! This cart comes stocked with some ingredients for each type of scoopable icecream." - cost = 2750 //Comes prestocked with basic ingredients - contains = list(/obj/machinery/icecream_vat) - crate_name = "ice cream vat crate" - crate_type = /obj/structure/closet/crate - -/datum/supply_pack/service/janitor - name = "Janitorial Supplies Crate" - desc = "Fight back against dirt and grime with Nanotrasen's Janitorial Essentials(tm)! Contains three buckets, caution signs, and cleaner grenades. Also has a single mop, spray cleaner, rag, NT soap and a trash bag." - cost = 1300 - contains = list(/obj/item/reagent_containers/glass/bucket, - /obj/item/reagent_containers/glass/bucket, - /obj/item/reagent_containers/glass/bucket, - /obj/item/mop, - /obj/item/caution, - /obj/item/caution, - /obj/item/caution, - /obj/item/storage/bag/trash, - /obj/item/reagent_containers/spray/cleaner, - /obj/item/reagent_containers/rag, - /obj/item/grenade/chem_grenade/cleaner, - /obj/item/grenade/chem_grenade/cleaner, - /obj/item/grenade/chem_grenade/cleaner, - /obj/item/soap/nanotrasen) - crate_name = "janitorial supplies crate" - -/datum/supply_pack/service/janitor/janicart - name = "Janitorial Cart and Galoshes Crate" - desc = "The keystone to any successful janitor. As long as you have feet, this pair of galoshes will keep them firmly planted on the ground. Also contains a janitorial cart." - cost = 2000 - contains = list(/obj/structure/janitorialcart, - /obj/item/clothing/shoes/galoshes) - crate_name = "janitorial cart crate" - crate_type = /obj/structure/closet/crate/large - -/datum/supply_pack/service/janitor/janitank - name = "Janitor Backpack Crate" - desc = "Call forth divine judgement upon dirt and grime with this high capacity janitor backpack. Contains 500 units of station-cleansing cleaner. Requires janitor access to open." - cost = 1000 - access = ACCESS_JANITOR - contains = list(/obj/item/watertank/janitor) - crate_name = "janitor backpack crate" - crate_type = /obj/structure/closet/crate/secure - -/datum/supply_pack/service/janitor/janpremium - name = "Janitor Premium Supplies" - desc = "Do to the union for better supplies, we have desided to make a deal for you, In this crate you can get a brand new chem, Drying Angent this stuff is the work of slimes or magic! This crate also contains a rag to test out the Drying Angent magic, three wet floor signs, and some spare bottles of ammonia." - cost = 1750 - access = ACCESS_JANITOR - contains = list(/obj/item/caution, - /obj/item/caution, - /obj/item/caution, - /obj/item/reagent_containers/rag, - /obj/item/reagent_containers/glass/bottle/ammonia, - /obj/item/reagent_containers/glass/bottle/ammonia, - /obj/item/reagent_containers/glass/bottle/ammonia, - /obj/item/reagent_containers/spray/drying_agent) - crate_name = "janitor backpack crate" - -/datum/supply_pack/service/janitor/janpimp - name = "Custodial Cruiser" - desc = "Clown steal your ride? Assistant lock it in the dorms? Order a new one and get back to cleaning in style!" - cost = 3000 - access = ACCESS_JANITOR - contains = list(/obj/vehicle/ridden/janicart, - /obj/item/key/janitor) - crate_name = "janitor ride crate" - crate_type = /obj/structure/closet/crate/large - /datum/supply_pack/service/mule name = "MULEbot Crate" desc = "Pink-haired Quartermaster not doing her job? Replace her with this tireless worker, today!" @@ -128,75 +36,6 @@ crate_name = "\improper MULEbot Crate" crate_type = /obj/structure/closet/crate/large -/datum/supply_pack/service/party - name = "Party Equipment" - desc = "Celebrate both life and death on the station with Nanotrasen's Party Essentials(tm)! Contains seven colored glowsticks, four beers, two ales, and a bottle of patron, goldschlager, and shaker!" - cost = 2000 - contains = list(/obj/item/storage/box/drinkingglasses, - /obj/item/reagent_containers/food/drinks/shaker, - /obj/item/reagent_containers/food/drinks/bottle/patron, - /obj/item/reagent_containers/food/drinks/bottle/goldschlager, - /obj/item/reagent_containers/food/drinks/ale, - /obj/item/reagent_containers/food/drinks/ale, - /obj/item/reagent_containers/food/drinks/beer, - /obj/item/reagent_containers/food/drinks/beer, - /obj/item/reagent_containers/food/drinks/beer, - /obj/item/reagent_containers/food/drinks/beer, - /obj/item/flashlight/glowstick, - /obj/item/flashlight/glowstick/red, - /obj/item/flashlight/glowstick/blue, - /obj/item/flashlight/glowstick/cyan, - /obj/item/flashlight/glowstick/orange, - /obj/item/flashlight/glowstick/yellow, - /obj/item/flashlight/glowstick/pink) - crate_name = "party equipment crate" - -/datum/supply_pack/service/carpet - name = "Premium Carpet Crate" - desc = "Plasteel floor tiles getting on your nerves? These stacks of extra soft carpet will tie any room together. Contains one of each pattern: classic, black, black-red and monochrome." - cost = 1000 - contains = list(/obj/item/stack/tile/carpet/fifty, - /obj/item/stack/tile/carpet/blackred/fifty, - /obj/item/stack/tile/carpet/black/fifty, - /obj/item/stack/tile/carpet/monochrome/fifty) - crate_name = "premium carpet crate" - -/datum/supply_pack/service/carpet_exotic - name = "Exotic Carpet Crate" - desc = "Exotic carpets straight from Space Russia, for all your decorating needs. Contains 100 tiles each of 10 different flooring patterns." - cost = 7000 - contains = list(/obj/item/stack/tile/carpet/blue/fifty, - /obj/item/stack/tile/carpet/blue/fifty, - /obj/item/stack/tile/carpet/cyan/fifty, - /obj/item/stack/tile/carpet/cyan/fifty, - /obj/item/stack/tile/carpet/green/fifty, - /obj/item/stack/tile/carpet/green/fifty, - /obj/item/stack/tile/carpet/orange/fifty, - /obj/item/stack/tile/carpet/orange/fifty, - /obj/item/stack/tile/carpet/purple/fifty, - /obj/item/stack/tile/carpet/purple/fifty, - /obj/item/stack/tile/carpet/red/fifty, - /obj/item/stack/tile/carpet/red/fifty, - /obj/item/stack/tile/carpet/royalblue/fifty, - /obj/item/stack/tile/carpet/royalblue/fifty, - /obj/item/stack/tile/carpet/royalblack/fifty, - /obj/item/stack/tile/carpet/royalblack/fifty, - /obj/item/stack/tile/carpet/blackred/fifty, - /obj/item/stack/tile/carpet/blackred/fifty, - /obj/item/stack/tile/carpet/monochrome/fifty, - /obj/item/stack/tile/carpet/monochrome/fifty) - crate_name = "exotic carpet crate" - -/datum/supply_pack/service/lightbulbs - name = "Replacement Lights" - desc = "May the light of Aether shine upon this station! Or at least, the light of forty two light tubes and twenty one light bulbs as well as a light replacer." - cost = 1200 - contains = list(/obj/item/storage/box/lights/mixed, - /obj/item/storage/box/lights/mixed, - /obj/item/storage/box/lights/mixed, - /obj/item/lightreplacer) - crate_name = "replacement lights" - /datum/supply_pack/service/minerkit name = "Shaft Miner Starter Kit" desc = "All the miners died too fast? Assistant wants to get a taste of life off-station? Either way, this kit is the best way to turn a regular crewman into an ore-producing, monster-slaying machine. Contains meson goggles, a pickaxe, advanced mining scanner, cargo headset, ore bag, gasmask, and explorer suit. Requires QM access to open." @@ -213,9 +52,188 @@ crate_type = /obj/structure/closet/crate/secure ////////////////////////////////////////////////////////////////////////////// -/////////////////////////// Vending Restocks ///////////////////////////////// +/////////////////////// Chef, Botanist, Bartender //////////////////////////// ////////////////////////////////////////////////////////////////////////////// +/datum/supply_pack/service/buildabar + name = "Build a Bar Crate" + desc = "Looking to set up your own little safe haven? Maintenance bar too much of a bummer to work on? Maybe you just want to set up shop right in front of the bartender. Whatever your reasons, get a jump-start on this with this handy kit. Contains circuitboards for bar equipment, some parts, and some basic bartending supplies. (Batteries not Included)" + cost = 3750 + contains = list(/obj/item/storage/box/drinkingglasses, + /obj/item/storage/box/drinkingglasses, + /obj/item/stock_parts/matter_bin, + /obj/item/stock_parts/matter_bin, + /obj/item/stock_parts/matter_bin, + /obj/item/stock_parts/matter_bin, + /obj/item/stock_parts/matter_bin, + /obj/item/stock_parts/matter_bin, + /obj/item/stock_parts/manipulator, + /obj/item/stock_parts/manipulator, + /obj/item/stock_parts/manipulator, + /obj/item/stock_parts/capacitor, + /obj/item/stock_parts/capacitor, + /obj/item/stack/sheet/metal/ten, + /obj/item/stack/sheet/metal/five, + /obj/item/stack/sheet/glass/five, + /obj/item/stack/cable_coil/random, + /obj/item/reagent_containers/rag, + /obj/item/book/manual/wiki/barman_recipes, + /obj/item/book/granter/action/drink_fling, + /obj/item/reagent_containers/food/drinks/shaker, + /obj/item/circuitboard/machine/chem_dispenser/drinks/beer, + /obj/item/circuitboard/machine/chem_dispenser/drinks, + /obj/item/circuitboard/machine/dish_drive) + crate_name = "build a bar crate" + +/datum/supply_pack/service/food_cart + name = "Food Cart Crate" + desc = "Want to sell food on the go? Cook lost their cart? Well we just so happen to have a few carts to spare!" + cost = 1000 + contains = list(/obj/machinery/food_cart) + crate_name = "food cart crate" + crate_type = /obj/structure/closet/crate + +/datum/supply_pack/service/icecream_cart + name = "Ice Cream Cart Crate" + desc = "Plasma fire too hot for you? Want a nice treat after a hard days work? Well now we have the cart for you! This Ice Cream Vat has everthing you need to make you and your friends so ice cream treats! This cart comes stocked with some ingredients for each type of scoopable icecream." + cost = 2750 //Comes prestocked with basic ingredients + contains = list(/obj/machinery/icecream_vat) + crate_name = "ice cream vat crate" + crate_type = /obj/structure/closet/crate + +/datum/supply_pack/service/cutlery + name = "Kitchen Cutlery Deluxe Set" + desc = "Need to slice and dice away those ''Tomatoes''? Well we got what you need! From a nice set of knifes, forks, plates, glasses, and a whetstone for when you got some grizzle that is a bit harder to slice then normal." + cost = 10000 + contraband = TRUE + contains = list(/obj/item/sharpener, //Deluxe for a reason + /obj/item/kitchen/fork, + /obj/item/kitchen/fork, + /obj/item/kitchen/knife, + /obj/item/kitchen/knife, + /obj/item/kitchen/knife, + /obj/item/kitchen/knife, + /obj/item/kitchen/knife/butcher, + /obj/item/kitchen/knife/butcher, + /obj/item/kitchen/rollingpin, + /obj/item/trash/plate, + /obj/item/trash/plate, + /obj/item/trash/plate, + /obj/item/trash/plate, + /obj/item/reagent_containers/food/drinks/drinkingglass, + /obj/item/reagent_containers/food/drinks/drinkingglass, + /obj/item/reagent_containers/food/drinks/drinkingglass, + /obj/item/reagent_containers/food/drinks/drinkingglass/shotglass, + /obj/item/reagent_containers/food/drinks/drinkingglass/shotglass) + crate_name = "kitchen cutlery deluxe set" + +////////////////////////////////////////////////////////////////////////////// +/////////////////////////////// Janitor ////////////////////////////////////// +////////////////////////////////////////////////////////////////////////////// + +/datum/supply_pack/service/advlighting + name = "Advanced Lighting crate" + desc = "Thanks to advanced lighting tech we here at the Lamp Factory have be able to produce more lamps and lamp items! This crate has three lamps, a box of lights and a state of the art rapid-light-device!" + cost = 2750 + contains = list(/obj/item/construction/rld, + /obj/item/flashlight/lamp, + /obj/item/flashlight/lamp, + /obj/item/flashlight/lamp/green, + /obj/item/storage/box/lights/mixed) + crate_name = "advanced lighting crate" + crate_type = /obj/structure/closet/crate/secure + +/datum/supply_pack/service/lightbulbs + name = "Replacement Lights" //Subgrouping this with Advanced Lighting Crate, they're both lighting related. + desc = "May the light of Aether shine upon this station! Or at least, the light of forty two light tubes and twenty one light bulbs as well as a light replacer." + cost = 1200 + contains = list(/obj/item/storage/box/lights/mixed, + /obj/item/storage/box/lights/mixed, + /obj/item/storage/box/lights/mixed, + /obj/item/lightreplacer) + crate_name = "replacement lights" + +/datum/supply_pack/service/janitor/advanced + name = "Advanced Sanitation Crate" + desc = "Contains all the essentials for an advanced spacefaring cleanup crew. This kit includes a trashbag, an advanced mop, a bottle of space cleaner, a floor buffer, and a holosign projector. Requires Janitorial Access to Open" + cost = 5700 + access = ACCESS_JANITOR + contains = list(/obj/item/storage/bag/trash/bluespace, + /obj/item/reagent_containers/spray/cleaner, + /obj/item/mop/advanced, + /obj/item/lightreplacer, + /obj/item/janiupgrade, + /obj/item/holosign_creator) + crate_name = "advanced santation crate" + crate_type = /obj/structure/closet/crate/secure + +/datum/supply_pack/service/janitor/janpimp + name = "Custodial Cruiser" + desc = "Clown steal your ride? Assistant lock it in the dorms? Order a new one and get back to cleaning in style!" + cost = 3000 + access = ACCESS_JANITOR + contains = list(/obj/vehicle/ridden/janicart, + /obj/item/key/janitor) + crate_name = "janitor ride crate" + crate_type = /obj/structure/closet/crate/large + +/datum/supply_pack/service/janitor/janitank + name = "Janitor Backpack Crate" + desc = "Call forth divine judgement upon dirt and grime with this high capacity janitor backpack. Contains 500 units of station-cleansing cleaner. Requires janitor access to open." + cost = 1000 + access = ACCESS_JANITOR + contains = list(/obj/item/watertank/janitor) + crate_name = "janitor backpack crate" + crate_type = /obj/structure/closet/crate/secure + +/datum/supply_pack/service/janitor/janpremium + name = "Janitor Supplies (Premium)" + desc = "The custodial union is in a tizzy, so we've gathered up some better supplies for you. In this crate you can get a brand new chem, Drying Agent. This stuff is the work of slimes or magic! This crate also contains a rag to test out the Drying Angent magic, several cleaning grenades, some spare bottles of ammonia, and an MCE (or Massive Cleaning Explosive)." + cost = 2700 + contains = list(/obj/item/grenade/clusterbuster/cleaner, + /obj/item/grenade/chem_grenade/cleaner, + /obj/item/grenade/chem_grenade/cleaner, + /obj/item/grenade/chem_grenade/cleaner, + /obj/item/reagent_containers/rag, + /obj/item/reagent_containers/glass/bottle/ammonia, + /obj/item/reagent_containers/glass/bottle/ammonia, + /obj/item/reagent_containers/glass/bottle/ammonia, + /obj/item/reagent_containers/spray/drying_agent) + crate_name = "premium janitorial crate" + +/datum/supply_pack/service/janitor/starter + name = "Janitorial Supplies (Standard)" + desc = "Fight back against dirt and grime with Nanotrasen's Janitorial Essentials(tm)! Contains three buckets, caution signs, and cleaner grenades. Also has a single mop, spray cleaner, rag, NT soap and a trash bag." + cost = 1300 + contains = list(/obj/item/reagent_containers/glass/bucket, + /obj/item/reagent_containers/glass/bucket, + /obj/item/reagent_containers/glass/bucket, + /obj/item/mop, + /obj/item/caution, + /obj/item/caution, + /obj/item/caution, + /obj/item/storage/bag/trash, + /obj/item/reagent_containers/spray/cleaner, + /obj/item/reagent_containers/rag, + /obj/item/grenade/chem_grenade/cleaner, + /obj/item/grenade/chem_grenade/cleaner, + /obj/item/grenade/chem_grenade/cleaner, + /obj/item/soap/nanotrasen) + crate_name = "standard janitorial crate" + +/datum/supply_pack/service/janitor/janicart + name = "Janicart and Galoshes Crate" + desc = "The keystone to any successful janitor. As long as you have feet, this pair of galoshes will keep them firmly planted on the ground. Also contains a janitorial cart." + cost = 2000 + contains = list(/obj/structure/janitorialcart, + /obj/item/clothing/shoes/galoshes) + crate_name = "janitorial cart crate" + crate_type = /obj/structure/closet/crate/large + +////////////////////////////////////////////////////////////////////////////// +//////////////////////////// Vendor Refills ////////////////////////////////// +////////////////////////////////////////////////////////////////////////////// + /datum/supply_pack/service/vending/bartending name = "Bartending Supply Crate" desc = "Bring on the booze with vending machine refills, as well as a free book containing the well-kept secrets to the bartending trade!" diff --git a/code/modules/cargo/supplypod_beacon.dm b/code/modules/cargo/supplypod_beacon.dm index 915d671fe8..006f1a8084 100644 --- a/code/modules/cargo/supplypod_beacon.dm +++ b/code/modules/cargo/supplypod_beacon.dm @@ -76,12 +76,14 @@ to_chat(user, "[src] linked to [C].") /obj/item/supplypod_beacon/AltClick(mob/user) + . = ..() if (!user.canUseTopic(src, !issilicon(user))) return if (express_console) unlink_console() else to_chat(user, "There is no linked console!") + return TRUE /obj/item/supplypod_beacon/attackby(obj/item/W, mob/user) if(istype(W, /obj/item/pen)) //give a tag that is visible from the linked express console diff --git a/code/modules/client/preferences.dm b/code/modules/client/preferences.dm index e91d379ddd..00cc01105d 100644 --- a/code/modules/client/preferences.dm +++ b/code/modules/client/preferences.dm @@ -14,7 +14,7 @@ GLOBAL_LIST_EMPTY(preferences_datums) //doohickeys for savefiles var/path var/default_slot = 1 //Holder so it doesn't default to slot 1, rather the last one used - var/max_save_slots = 8 + var/max_save_slots = 16 //non-preference stuff var/muted = 0 @@ -103,6 +103,7 @@ GLOBAL_LIST_EMPTY(preferences_datums) "legs" = "Plantigrade", "insect_wings" = "Plain", "insect_fluff" = "None", + "insect_markings" = "None", "mcolor2" = "FFF", "mcolor3" = "FFF", "mam_body_markings" = "Plain", @@ -170,12 +171,8 @@ GLOBAL_LIST_EMPTY(preferences_datums) var/prefered_security_department = SEC_DEPT_RANDOM var/custom_species = null - //Quirk list - var/list/positive_quirks = list() - var/list/negative_quirks = list() - var/list/neutral_quirks = list() + //Quirk list var/list/all_quirks = list() - var/list/character_quirks = list() //Job preferences 2.0 - indexed by job title , no key or value implies never var/list/job_preferences = list() @@ -221,7 +218,7 @@ GLOBAL_LIST_EMPTY(preferences_datums) load_path(C.ckey) unlock_content = C.IsByondMember() if(unlock_content) - max_save_slots = 16 + max_save_slots = 24 var/loaded_preferences_successfully = load_preferences() if(loaded_preferences_successfully) if(load_character()) @@ -241,7 +238,7 @@ GLOBAL_LIST_EMPTY(preferences_datums) /datum/preferences/proc/ShowChoices(mob/user) if(!user || !user.client) return - update_preview_icon() + update_preview_icon(current_tab != 2) var/list/dat = list("
"
dat += "Flavor Text" dat += "Set Examine Text" @@ -625,6 +621,19 @@ GLOBAL_LIST_EMPTY(preferences_datums) dat += "[features["taur"]]" + if("insect_markings" in pref_species.default_features) + if(!mutant_category) + dat += APPEARANCE_CATEGORY_COLUMN + + dat += " Insect markings" + + dat += "[features["insect_markings"]]" + + mutant_category++ + if(mutant_category >= MAX_MUTANT_ROWS) + dat += " | "
+ mutant_category = 0
+
mutant_category++
if(mutant_category >= MAX_MUTANT_ROWS)
dat += ""
@@ -1201,7 +1210,7 @@ GLOBAL_LIST_EMPTY(preferences_datums)
dat += "
|
- Citadel Station
- A downstream of /tg/Station
-
- Visit tg's IRC channel: #tgstation13 on irc.rizon.net
- ...Or our Discord!
+ Traditional Games Space Station 13
+
+
|
|
- Current Project Maintainers: deathride58, LetterJay, kevinz000, BlackMajor, Izzy - Currently Active GitHub contributor list: -Click Here- - Coders: Fermis, Poojawa, deathride58, kevinz000, Trilbyspaceclone, nik707, Ghommie as well as the /tg/ crew. - Spriters: Michiyamenotehifunana, CameronWoof, and the folks who contributed to /tg/ station project. - Sounds: /tg/ Sound crew. - Main Testers: You poor saps, our player base. - Thanks to: /tg/station, Baystation 12, /vg/station, NTstation, CDK Station devs, FacepunchStation, GoonStation devs, the original SpaceStation developers and Invisty for the title image. Also a thanks to anybody who has contributed who is not listed here :( Ask to be added here on irc. + Thanks to: /tg/station, Baystation 12, /vg/station, NTstation, CDK Station devs, FacepunchStation, GoonStation devs, the original SpaceStation developers and Invisty for the title image. Also a thanks to anybody who has contributed. Have a bug to report? Visit our Issue Tracker. - Please ensure that the bug has not already been reported upstream and use the template provided here!. + Please ensure that the bug has not already been reported, use the template provided here!. + Currently Active GitHub contributor list: -Click Here- |
+
+
07 December 2019
+AffectedArc07 updated:
+-
+
- Fixes a LOT of code edge cases +
Anonymous updated:
+-
+
- Added NEET-- I mean, DAB Suit and Helmet into loadout. Exclusive to Assistants, for obvious reasons, and don't provide any armor. Goes well with balaclava, finger-less gloves and jackboots for that true tactic~~f~~ool experience. +
- Renamed loadout name appropriately (ASSU -> DAB) +
Arturlang updated:
+-
+
- PDA catridges cant be irradiated anymore. +
Bhijn updated:
+-
+
- Item mousedrop() now provides a return value indicating whether or not behavior has been overridden somehow. +
- Defibs now properly check that their loc is the same as the user for mousedrop() calls, meaning ghosts can no longer make you equip defibs. Plus extra sanity checks. +
- Pet carriers no longer attack turfs while trying to unload their contents. +
- Decks of cards now function as they originally intended when attempting to use their drag and drop behavior. +
- Paper bins and papercutters no longer act wonky when you're trying to pull a piece of paper from them. +
- Adds clothing drag n drop sanity checks. +
- Sythetic hats now have extra sanity checks +
Coconutwarrior97 updated:
+-
+
- Can only wrench down two transit tubes per turf. +
Commandersand updated:
+-
+
- Added more stuff to loadout,check uniforms mask and backpack +
DeltaFire15 updated:
+-
+
- Adds eight new plushies +
- Adds icons for the new plushies and adds a new icon for the skylar plush +
- Deleted a old, no-longer used icon for the skylar plush +
- Fixed a typo in the trilby plush +
Fermis updated:
+-
+
- tweaks botany reagent pHes +
- Purity, Astral, RNG, MK, SMilk, SDGF, furranium, hatmium, eigen, nanite. +
- Eigen and purity. +
- refactored sleepers! +
- Organ fridges to all maps near surgery with a random sensible organ, steralizine and synthtissue. +
- the med hand scanner to be less of a mishmash of random things +
- a little icon to the HUD if someone's heart has failed. +
- Lets neurine's brain splash attack work via syringe. +
- a new surgery; Emergency Cardioversion Induction for use on the recently deceased +
- Synthtissue to be less demanding on growth size for organ regeneration and improves clarify of it's growth gated effects. +
- Synthtissue now is more useful than synthflesh on the dead +
Fox McCloud updated:
+-
+
- Fixes a very longstanding LINDA bug where turfs adjacent to a hotspot would be less prone to igniting +
Fox McCloud, Ghommie updated:
+-
+
- Fixes being able to mech-punch other mobs, as a pacifist +
- Fixes being able to hurt people, as a pacifist, by throwing them into a wall or other mob, or by using most martial arts (save for the unpredictable psychotic brawl, and the stamina-damage-only boxing). +
- Buffs boxing to outdamage natural stamina regeneration. Made the chance of outright missing your opponent actually possible. +
- Pacifists can now engage in the (laughably not harmful) sweet sweet art of boxing now. +
Ghommie updated:
+-
+
- Fixing implant cases being lost inside implant pads when trying to eject them with your active hand full. +
- Moved the implant pad's case ejection from attack_hand() to AltClick(), added examination infos about it. +
- Fixed holodeck sleepers leaving sleeper buffers behind when deleted. +
- Fixed traitor codewords highlight and some other hear signal hooks spans highlight (phobias, split personality, hypnosis) or modifiers (mind echo) +
- Fixed traitor codewords highlight not passing down with the mind datum and stickying to the first mob. +
- Fixed the incongruent bone satchel description. +
- Fixed sofa overlays doing nothing, because their layer wasn't properly set. +
- Suicide and cryo now prevents ghost/midround roles for a definite duration of 30 minutes (and more if that was done before 30 minutes in the game passed), down from the rest of the round. +
- fixed several midround roles bypassing and nulling the aforementioned prevention measures. +
- Fixed the little issue of PDA skins not updating on job equip. +
- Anomaly Crystals of the clowning type will now rename the victim to their clown name preference when triggered, instead of giving them a random clown name. +
- Lowered blob event earliest start from 1 hour to 40 minutes (ergo one third), and the required player population from 40 to 35. +
- Several fixes and QoL for dullahans. They can see and hear visible and audible messages now, don't need a space helmet they can't wear anyway to be space/temperature proof, can examine things through shiftclick, and, most of all, fixed their head being unpickable. Fixed dullahans gibbing when revived or had their limbs regenerated. +
- humans should now drop gibs when gibbed again. +
- synths (not to be confused with IPCs), android and corporate species, as well as robotic simple mobs, will now spawn robotic giblets instead of organic ones. +
- You can't wear dakimakuras in any other inappropriate slots save for the back slot anymore, degenerates. +
- Insert snarky remark about clock welders actually displaying the welder flame overlay when turned on now here. +
- Minor ninja tweaks and stealth nerfs. The stealth penalty for the many combat-related actions, bumping and now teleporting/dashing or firing guns has been increased a by a third. There is now a cooldown of 5 seconds on toggling stealth as well as a slighty slowed stealth in/out animation. +
- Ported slighty better matchbox sprites from CEV-Eris, also resprited cigar boxes myself. +
- Fixed abductors/abductees objectives by porting an objective code. +
- Riding component fix +
- fixing a few runtimes on lightgeists, libido trait, rcd, one admin transformation topic, chem dispensers, glowing robotic eyes... +
- Porting CEV-eris delivery packages sprites and dunking the old syndie cybernetics box sprite. +
- Certain objects shouldn't be able to become radioactive because of a bitflag that previously was checked nowhere in the code anymore. +
- Added a new PDA reskin, sprites from CEV-Eris +
- Clock cult starts with some spare vitality matrix charge scaled of the number of starter servants. +
- Made the vitality matrix sigil slighty more visible, also allowed conversion runes to heal fresh converts at the cost of some vitality charge. +
- Crawling won't save you from the wrath of ocular wardens and pressure sensors anymore, heretics. fix: Pressure sensors are no more triggered by floating/flying mobs. +
- Strawberry milk and tea have sprites now. +
- Fixed the Aux base camera door settings and toggle window type actions. Also enabling the user to modify both door access and type. +
- Improved the two grayscale towel item sprites a little. +
- Fixed towels onmob suit overlays. Again. +
- Fixed some reagents taste descriptions. +
- Fixed hidden random event reports only priting a paper message without sending the message to the consoles' message list. +
- Rosary beads prayer now works on non-carbon mobs too, and won't break when performed on a monkey or other humanoids. +
- You can flagellate people with rosary beads on harm intent. It's even mediocrer than the sord though. +
- Moved the `Stealth and Camouflage Items` uplink category next to `Devices and Tools`. +
- Deleted a duplicate phatom thief mask entry from the uplink. +
- Fixed missing delivery packages sprites +
- fixed a few minor issues with console frames building. +
- Wizards can use the teleport spell from their den once again. +
- Wizards will now receive feedback messages when attempting to cast teleport or use the warp whistle while in a no-teleport area. +
- New clockwork cultist, gondola, monkey and securitron cardboard cutouts. +
- Fixed aliens gasping randomly once in a while. +
- fixed superlube waterflower, my bad. +
- Fixed closing the aux base construction RCD's door access settings window throwing you out of camera mode when closed. +
- Removed not functional aux base RCD's door type menu. Use airlock painters, maybe. +
- Honkbot oil spills are of the slippery kind now. Honk. +
- local code scavenger finds forgotten slighty improved apc sprites left buried in old dusty folders. +
- Seven old and otherwordly pAI holochassis icons have crawled their way out of the modular citadel catacombs. +
- chem dispenser beakers end up in your hand yet again. +
- Bikehorns squeak yet again, the world is safe. +
- Cyborgs can now actually use cameras from a distance. +
- Suicides are yet again painful and instant and won't throw people in deep crit from full health. +
- fixed rogue pixels on the energy gu- ahem blaster carbine... and a few apc lights states being neigh-indistinguishable. +
- Fixed several "behind" layer tail sprites skipping areas normally covered by bodyparts. +
- Morgues' original alert beeping sound has been restored, they no longer go "ammunition depleted" +
- Fixed missing hypereutactic left inhand sprites. +
- Dying, ghosting, having your mind / ckey transferred to another mob, going softcrit or otherwise unconscious now properly turn off combat mode. +
- combat mode can't be toggled on while non fully conscious anymore. +
- Fixed limbs' set_disabled NOT dropping your held items, updating your hand slot inventory screen image, prompting chat messages and making your character scream like a sissy. +
- Lusty xenomoprh maids will now actually clean tiles they travel onto yet again. +
- Fixed double whitespace gap in human and AI examine. Fixed single whitespace in carbon examine. +
- Removed a few useless supply packs: "Siezed" power cells, means of production and promiscous organs. +
- Merged the synthetic blood supply pack into the standard blood supply pack, effectively removing a random type blood pack in favor of two synthetic ones. +
- Merged together premium carpet pack n°1 and n°2 to hold one of each standard pattern. +
- You can no longer estimate the amount of reagents found inside a damp rag. +
- You can now squeeze a rag's reagents into another open container, as long as the other one is not full. +
- Fixed ED-209 being unbuildable past the welding step. +
- Fixed ai displays status being reset to "Neutral" on login, regardless of choice. +
- Fixed tinfoil hats giving random traumas. +
Ghommie (original PR by Denton) updated:
+-
+
- Added three new .38 ammo types. TRAC bullets, which embed a tracking implant inside the target's body. The implant only lasts for five minutes and doesn't work as a teleport beacon. Hot Shot bullets set targets on fire; Iceblox bullets drastically lower the target's body temperature. They are available after researching the Subdermal Implants node (TRAC) or Exotic Ammunition node (Hot Shot/Iceblox). +
- Renamed the Technological Shells research node to Exotic Ammunition. +
- The "lifespan_postmortem" var now determines how long tracking implants work after death. +
- .357 AP speedloaders can now be ordered from syndicate uplinks. +
- lowered the cost of uplink's .357 speedloaderd from 4 to 3. +
Ghommie (original PR by nicbn and Menshin) updated:
+-
+
- You can click on things that are under flaps or holo barriers. +
Ghommie (original PRs by ShizCalev, CRTXBacon and Niknakflak) updated:
+-
+
- Adds the intelliLantern, a big ol' spooky intelliCard skin +
- crafting recipe for the new intelliCard skin (requires 1 pumpkin, 1 intelliCard, 5 cables and a wirecutter as a tool) +
- changed the intelliTater crafting recipe to match the intelliLantern recipe (but with a potato for obvious reasons) add:cute pai gameboy face :3 +
Ghommie, porting lot of PRs by MrDoomBringer, AnturK, nemvar and coiax. updated:
+-
+
- Admins can now launch supplypods the old, slightly quicker way as well +
- Centcom-launched supplypods will now properly delimb you (if they are designated to do so) instead of touching you then literally yeeting all of your internal organs out of your body. +
- Centcom can now specify if they want to yeet all of your organs out of your body with a supplypod +
- Supplypods sound a bit nicer as the land now. +
- admins can now adjust the animation duration for centcom-launched supplypods +
- admins can adjust any sounds that are played as the supplypod lands +
- Reverse-Supplypods (the admin-launched ones) no longer stay behind after rising up, and also auto-delete from centcom. +
- The centcom podlauncher now has better logging +
- Admins can now allow ghosts to follow the delivery of Centcom-launched supply pods +
- Admins can now use the Centcom Podlauncher to launch things without the things looking like they're being sent inside a pod. +
- sparks will not generate if the quietLanding effect is on, for the centcom podlauncher +
- makes input text clearer for the centcom podlauncher +
- New 'Podspawn' verb, which functions like 'Spawn', except any atoms movable spawned will be dropped in via a no-damage, no-explosion Centcom supply pod. +
- Removed an oversight that made many obj/effect subtypes accidentally bombproof. +
GrayRachnid updated:
+-
+
- Added saboteur syndicate engiborg +
- changed cyborg tool icons and the secborg taser/laser icons. +
- Fixes golden toolbox missing inhand sprite +
- Added traumas +
- Added science powergame tool +
- a few hearing args +
- fixed my mistakes +
- tweaked the number of ingredients/pancakes you can stack. +
Hatterhat updated:
+-
+
- The Big Red Button now sets bomb timers to 2 seconds, instead of 5. +
- Gloves of the North Star (not Hugs of the North Star) now use all their intents very, very fast. This does not apply to grabs' click cooldown, nor shoving people. +
- The seedvault/alien plant DNA manipulator can now be printed off with Alien Biotechnology. +
Iroquois-Pliskin updated:
+-
+
- Removed Clockwork Cult Surgical facility from Reebe +
Jerry Derpington, baldest of the balds, and nemvar. updated:
+-
+
- Nanotrasen has lost communication to two away mission sites that contained a beach for Nanotrasen employees. +
- Nanotrasen has been able to locate a new away mission site that ALSO has a beach. Nanotrasen employees will be able to enjoy the beach after all! +
- Seashells have been added to the game. +
KathrinBailey updated:
+-
+
- Two extra 'luxury' dorms rooms! +
- Gas miners to atmos. +
- Posters around the station. +
- Vacant room added to the Starboard Bow with it's own APC, above electrical maintenance. +
- New trendy clothes to the locker room, giving variety and bringing fashion back onto Nanotrasen stations. +
- Coloured bedsheet and towel bin. +
- Maid uniforms for the janitor. +
- Completely reworked bar. Milk kegs added in bar office. The bar has been changed for a homey restaurant feel just in time for Christmas! You can now run it as an actual restaurant! Local Bartender Icktsie III loved it so much he rolled around on the new floor smiling happily. +
- Dorms rework. Fitness room now has lots of costumes and outfits. +
- Junk removed from engineering, welding goggles added. +
- Welding tools in engineering replaced with industrial welding tools. +
- Package wrappers and hand labellers now in major departments. +
- Cell charger moved from engineering lobby to the protolathe room, just like how it is in all of the other maps and just where the cell charger is actually needed. +
- Library redesigned to have a private room and a 3x3 private study that is cleaned up. +
- Paper bins have gone big or gone home, with premium stationery scattered around. Engineering and security now have a labeller and packaging supplies. +
- Dark spot top left of Botany fixed. +
- Huge galactic-sized dark spot in bar fixed. +
- Light replacers now are less horrifically overpowered and PTSD-inducing for the server. +
- Fixes issue 9706: https://github.com/Citadel-Station-13/Citadel-Station-13/issues/9706 Part of maint getting hit by radstorms. +_Kathrin's Box Beautification:_ +
- Ports TG's pews https://github.com/tgstation/tgstation/pull/42712 +
- The first step of a corporate incursion of Space IKEA into Nanotrasen. +
Kevinz000, Cruix, MrStonedOne, Denton, Kmc2000, Anturk, MrDoomBringer, Dennok, TheChosenEvilOne, Ghommie updated:
+-
+
- Added support for Multi-Z power, atmospherics and disposals +
- massive service department nerf: space can no longer be extra crispy. +
Knouli updated:
+-
+
- attack_self proc for the legion core which triggers a self-heal al la the previous 'afterattack' proc, as if clicking on the character's own sprite to self-heal +
- admin logging for all three use cases of legion core healing - afterattack, attack_self, and implanted ui_action_click +
Krysonism, Ghommie updated:
+-
+
- NT has made breakthroughs in ice cream science, ice creams can now be flavoured with any reagent! +
- The ice cream vat now accepts beakers. +
- Grape and Peach icecreams have scoop overlays yet again. +
Linzolle updated:
+-
+
- butchering component update +
- hat tossing can no longer knock hats off +
- strange reagent being unable to revive simplemobs +
- jitter animation and more clear text to strange reagent revival +
Mickyy5 updated:
+-
+
- Nanotrasen are now issuing Plasmamen with plasma in their survival boxes +
MrJWhit updated:
+-
+
- tweaked brain damage line +
Naksu, ShizCalev updated:
+-
+
- Refactored examine-code +
- Examining a human with a burned prosthetic limb will no longer tell you that the limb is blistered. +
- Items will now inform you if they are resistant to frost, fire, acid, and lava when examined. +
Owai-Seek updated:
+-
+
- "silly" bounties +
- "gardenchef" bounties +
- several bounties that require seriously good RNG to pull off. +
- moved several chef and assistant bounties to silly and gardenchef +
- modified several bounty point rewards +
- added new files "silly.dm" and "gardenchef.dm" +
- 15+ new crates for cargo +
- organizes crates and moving them to proper categories +
- some dumb stuff like toner crates re +
- leg wraps and sweaters to clothesmate +
- screwdriver and cable coil to janidrobe +
- screwdriver and cable coil to janibelt whitelist (for fixing/placing light fixtures) +
- monkey cube, syringe, enzyme, soy sauce, and cryoxadone to chef's vendor (contraband and premium) +
- add cracker, beans, honey bars, lollipops, chocolate coin, and spider lollipop to snack vendors (contraband and premium) +
- newspaper to loadout menu for bapping purposes +
- removed poppy pretzels from snack vendor premium +
- maid uniform (janimaid alt) to kinkmate. +
- moves gear harness from premium to normal stock in kinkmate +
- re-balanced metal shield bounty +
- cryoxadone bottle (for use in chef vendor) +
PersianXerxes updated:
+-
+
- Reduces the grace period for meteors from a minimum of 5 and maximum of 10 to 3 and 6 minutes respectively. +
- Adds a pair of VR sleepers to Box Station's permabrig +
- Adds a pair of VR sleepers to Delta Station's permabrig +
- Adds a pair of VR sleepers to Pubby Station's permabrig +
- Adds a pair of VR sleepers to Meta Station's permabrig +
Putnam updated:
+-
+
- From-ghosts dynamic rulesets now actually listen to "required candidates" +
- Every dynamic-triggered event is now blacklisted from being triggered by the random events system when dynamic can trigger them. +
- Dynamic voting now features extended, if recent rounds have been chaotic. +
- Roundstart rulesets now scale on population ready rather than total population. +
- Threat log now accurately represents what actually used the threat. +
- Verbose threat log (admin-only) now shows ALL threat level changes. +
- VR mobs can no longer be dynamic midround antags. +
- Personal closets can use anything that holds an ID card now. +
Putnam3145 updated:
+-
+
- traitors work now +
- Gas filters now push gas the same way volume pumps do. +
- Gas filters now won't clog if only one output is clogged. +
- Glowsticks can no longer be radioactively contaminated (one more supermatter contam exploit gone) +
- traitor removal is no longer borked +
- Dynamic voting +
- Added DYNAMIC_VOTING to game_options +
- SDGF now copies memories as well as antag data and factions. +
- Summon events now properly costs threat. +
- Refunded spells refund threat, too. +
- Made wizard spells inherently have a requirement and cost. +
- Meteor wave is no longer repeatable in dynamic. +
- tweaked nuke ops +
- Organs can no longer be radioactively contaminated. +
Robustin, Subject217 updated:
+-
+
- The NukeOp Shuttle hull has been dramatically hardened. The walls are now "R-Walls" with far greater explosion resistance. +
- The NukeOp Shuttle guns have been significantly buffed. They now rapidly fire a new type of penetrator round, at a greater range, and have far greater explosion resistance. +
- The nuclear device on the NukeOp Shuttle is now in an anchored state by default, the Nuke can only be unanchored by inserting the disk and entering the proper code. +
- Non-Syndicate cyborgs are now unable to access the NukeOp Shuttle Console. +
- You can now unanchor Nukes even when the floor under them has been destroyed +
Seris02 updated:
+-
+
- added sleeping carp hallucination +
- Centcom + Assistant's formal winter coat + loadout + narsian + ratvarian winter coats +
- GPS location on examine +
- fixed the meteor hallucination +
- tweaked the way the tapered penis looks +
- Added nine winter coats +
- added images for the winter coats +
- adds the mining winter coat to mining wardrobes and mining lockers +
ShizCalev updated:
+-
+
- Ghosts can now see active AI cameras. +
- Fixed a couple of laser / energy guns never switching to the empty icon despite being unable to fire. +
Swindly updated:
+-
+
- Fixed MMIs not being able to use mecha equipment +
- Fixed MMIs not getting mecha mouse pointers +
- Fixed MMIs not getting medical HUDs in Odysseuses +
- Brains can now switch to harm intent +
Tetr4 updated:
+-
+
- Turning a tile with gas effects into space now gets rid of the effects. +
Trilbyspaceclone updated:
+-
+
- plastic trash cart crafting with plastic +
- wallets are known for now holding more items +
- shades and clowns HP +
- six more crates, A barrel, A Loom, 40 cotton sheets, two sets of fruit crates, raw lumber crate +
- All fermi chems, Boozes, Medical, food chems now sell +
- Loads more to sell - Mech gear, Cooking and more! +
- Moved around the vaule of some things and removed elastic of most items +
- Rebreather implants will now loss vaule, Do to being just metal and glass +
- lowered how many chems are in lewd chem kegs to be around 150-100 as well as the fancy booze kegs +
- bad returns and tools used +
- 8 new cargo crates! +
- tablet cargo crate by -3k +
- Closes a bunch of issues +
- updates changlogs and such +
- fixed a catnip not having sprites +
- Boh cant hold WEIGHT_CLASS_GIGANTIC, just Bulky. Makes katana, chainsaw and base ball bat into bulky items so they may fit +
- changes header to be more cit-like +
- new clothing for the hotel staff and a hat +
Ty-the-Smonk updated:
+-
+
- You can now interact with self sustaining crossbreeds +
Useroth updated:
+-
+
- Colored fairygrass variants. +
- Added a missing cherrybulb seedpack sprite +
- numbered storages now are sorted in a consistent way, instead of depending on ordering of their contents var +
- strange seeds as a buyable traitor botanist item +
- resolves the issues revolving around blackpowder exploding where the reaction happened, instead of where it actually is through making it explode instantly +
- the explosion delay moved from blackpowder directly into bomb cherries, to keep them functioning as intended +
- A bunch of newer tg plants +
- A bunch of newer tg plant traits +
- A couple of newer tg plant reagents +
- the new plants now properly get their reagents and reagent genes instead of being empty with UNKNOWN reagents listed in the DNA machine +
- extradimensional oranges now contain haloperidol +
- extradimensional oranges now actually grow properly and give proper seeds. +
Weblure updated:
+-
+
- Button added to slime console that prints out the hotkey commands to the user. [Includes DMI update] +
- Shift-click a slime to pick it up, or the floor to drop all held slimes. (Requires Basic Slime Console upgrade) +
- Ctrl-click a slime to scan it. +
- Alt-click a slime to feed it a potion. (Requires Advanced Slime Console upgrade) +
- Ctrl-click on a dead monkey to recycle it, or the floor to place a new monkey. (Requires Monkey Console upgrade) +
- If the console does not have the required upgrade, an error message will print to the user. +
- You can now pick up a single slime from a pile, instead of all of them at once. +
- When recycling monkeys, the console will now report how many monkeys it has (will not report decimal increases). +
- Console now alerts you when you're out of monkeys and reports your current decimal amount. +
- Console messages are now styled consistently. +
XDTM, ShizCalev, Naksu, Skoglol, cacogen, Rohesie (ported by Ghommie) updated:
+-
+
- Holding an ID in your hands uses it instead of your worn ID for authentication purposes. +
- If you don't have an ID in your id slot, the belt slot will be checked as well. +
- small cleanup to id and bounty console html generation +
- Hop console now hurts your eyes less. Red button text replaced with green. +
- IDs with ID console access now go into the Confirm Identity slot by default like they used to, similarly IDs without it go into the Target slot by default again +
- Can easily swap out IDs by clicking the machine or the UI fields with another ID +
- ID console now names which IDs are added/removed in its visible messages +
- Labels the ID slot fields when logged in so you know which is which +
- Can use Job Management without an ID provided the console is logged in (matches how the console now stays logged in even without an ID) +
- Can log in without an ID in the Target field (matches how the machine now stays logged in even after the ID is removed from the Target field) +
- Cleans up UI slightly (had some duplicate/conflicting buttons) +
- Fixes ID console duping issues. Includes some ID containers, such as PDAs, tablets and wallets, into the swapping behavior when an ID card is being removed and the item is being held. +
Xantholne updated:
+-
+
- New Berets for most heads and departments available in their autodrobes or lockers +
YakumoChen updated:
+-
+
- New AI Holograms and Displays! Ported from /vg/station. +
actioninja updated:
+-
+
- med records no longer can eat id cards for no reason +
- Chat is properly sent to legacy window if goonchat fails to load again. +
dapnee updated:
+-
+
- fixed closet initialisation being broken +
- emergency closets no longer have a 1% chance to delete themselves +
- Communications console window no longer updates, won't steal focus anymore. +
- Trimline neutral end exists now. +
dzahlus updated:
+-
+
- added a new gun sounds +
- removed an old gun sounds +
him updated:
+-
+
- hos and aeg guns now conform to le epic taser rework standards +
kappa-sama updated:
+-
+
- changed flavor text of alien tech on uplink +
- added TG's icons for traitor, russian, and golden revolver +
kevinz000 updated:
+-
+
- you can now choose never for this round for magical antags +
- Cargo has passive point generation again at 750 points/minute +
- Mindshield crate price increased from 3000 to 4000 +
- Miasma sell price reduced from 15/mol to 4/mol +
- bluespace wizard apprentice now has blink instead of targeted area teleportation +
- Emagged medibots now charcoal toxinlovers. +
- disablers buffed 0.7 --> 0.6 speed 24 --> 28 damage +
- kinetic crushers no longer drop if you try to use it with one hand +
- added multi_keyed_list, delimiter defaults to |. +
- Light pink extracts no longer speed you up. Instead, they give stamina regeneration and free sprinting. +
kiwedespars updated:
+-
+
- removed moth fluff coloring you like your wings +
- made insect not so bad. +
nemvar updated:
+-
+
- You now get a message if your PDA explodes while you are holding it. +
- The lavaland clown ruin has some new pranks ready. +
- Added a new loot item to the lavaland clown ruin. +
- Removed the slime core from said ruin. +
- The clown PDA now properly slips people on jogging move intent regardless of fatigue. Honkmother's will. +
nemvar, ShizCalev, Qustinnus/Floyd, Ghommie updated:
+-
+
- You can now unfasten the loom. +
- it now takes 4 strands to make one piece of durathread cloth +
- Looms can now be attacked. +
- Durathread golem weaves his magic +
- Supply ordered looms are unanchored. Bring a wrench. +
r4d6 updated:
+-
+
- Added Departements Winter Coats to the loadout list. +
04 November 2019
4dplanner, MMiracles updated:
-
diff --git a/html/changelogs/.all_changelog.yml b/html/changelogs/.all_changelog.yml
index 75cb5f4040..f5e4fea7cb 100644
--- a/html/changelogs/.all_changelog.yml
+++ b/html/changelogs/.all_changelog.yml
@@ -23119,3 +23119,540 @@ DO NOT EDIT THIS FILE BY HAND! AUTOMATICALLY GENERATED BY ss13_genchangelog.py.
less power or emag borgs for higher prices, limited uses, but higher power.
ursamedium:
- imageadd: Gas icons changed.
+2019-12-07:
+ AffectedArc07:
+ - code_imp: Fixes a LOT of code edge cases
+ Anonymous:
+ - rscadd: Added NEET-- I mean, DAB Suit and Helmet into loadout. Exclusive to Assistants,
+ for obvious reasons, and don't provide any armor. Goes well with balaclava,
+ finger-less gloves and jackboots for that true tactic~~f~~ool experience.
+ - tweak: Renamed loadout name appropriately (ASSU -> DAB)
+ Arturlang:
+ - tweak: PDA catridges cant be irradiated anymore.
+ Bhijn:
+ - code_imp: Item mousedrop() now provides a return value indicating whether or not
+ behavior has been overridden somehow.
+ - bugfix: Defibs now properly check that their loc is the same as the user for mousedrop()
+ calls, meaning ghosts can no longer make you equip defibs. Plus extra sanity
+ checks.
+ - bugfix: Pet carriers no longer attack turfs while trying to unload their contents.
+ - bugfix: Decks of cards now function as they originally intended when attempting
+ to use their drag and drop behavior.
+ - bugfix: Paper bins and papercutters no longer act wonky when you're trying to
+ pull a piece of paper from them.
+ - bugfix: Adds clothing drag n drop sanity checks.
+ - bugfix: Sythetic hats now have extra sanity checks
+ Coconutwarrior97:
+ - bugfix: Can only wrench down two transit tubes per turf.
+ Commandersand:
+ - rscadd: Added more stuff to loadout,check uniforms mask and backpack
+ DeltaFire15:
+ - rscadd: Adds eight new plushies
+ - imageadd: Adds icons for the new plushies and adds a new icon for the skylar plush
+ - imagedel: Deleted a old, no-longer used icon for the skylar plush
+ - spellcheck: Fixed a typo in the trilby plush
+ Fermis:
+ - tweak: tweaks botany reagent pHes
+ - tweak: Purity, Astral, RNG, MK, SMilk, SDGF, furranium, hatmium, eigen, nanite.
+ - bugfix: Eigen and purity.
+ - refactor: refactored sleepers!
+ - rscadd: Organ fridges to all maps near surgery with a random sensible organ, steralizine
+ and synthtissue.
+ - tweak: the med hand scanner to be less of a mishmash of random things
+ - rscadd: a little icon to the HUD if someone's heart has failed.
+ - tweak: Lets neurine's brain splash attack work via syringe.
+ - rscadd: a new surgery; Emergency Cardioversion Induction for use on the recently
+ deceased
+ - tweak: Synthtissue to be less demanding on growth size for organ regeneration
+ and improves clarify of it's growth gated effects.
+ - tweak: Synthtissue now is more useful than synthflesh on the dead
+ Fox McCloud:
+ - bugfix: Fixes a very longstanding LINDA bug where turfs adjacent to a hotspot
+ would be less prone to igniting
+ Fox McCloud, Ghommie:
+ - bugfix: Fixes being able to mech-punch other mobs, as a pacifist
+ - bugfix: Fixes being able to hurt people, as a pacifist, by throwing them into
+ a wall or other mob, or by using most martial arts (save for the unpredictable
+ psychotic brawl, and the stamina-damage-only boxing).
+ - balance: Buffs boxing to outdamage natural stamina regeneration. Made the chance
+ of outright missing your opponent actually possible.
+ - tweak: Pacifists can now engage in the (laughably not harmful) sweet sweet art
+ of boxing now.
+ Ghommie:
+ - bugfix: Fixing implant cases being lost inside implant pads when trying to eject
+ them with your active hand full.
+ - tweak: Moved the implant pad's case ejection from attack_hand() to AltClick(),
+ added examination infos about it.
+ - bugfix: Fixed holodeck sleepers leaving sleeper buffers behind when deleted.
+ - bugfix: Fixed traitor codewords highlight and some other hear signal hooks spans
+ highlight (phobias, split personality, hypnosis) or modifiers (mind echo)
+ - bugfix: Fixed traitor codewords highlight not passing down with the mind datum
+ and stickying to the first mob.
+ - spellcheck: Fixed the incongruent bone satchel description.
+ - bugfix: Fixed sofa overlays doing nothing, because their layer wasn't properly
+ set.
+ - tweak: Suicide and cryo now prevents ghost/midround roles for a definite duration
+ of 30 minutes (and more if that was done before 30 minutes in the game passed),
+ down from the rest of the round.
+ - bugfix: fixed several midround roles bypassing and nulling the aforementioned
+ prevention measures.
+ - bugfix: Fixed the little issue of PDA skins not updating on job equip.
+ - tweak: Anomaly Crystals of the clowning type will now rename the victim to their
+ clown name preference when triggered, instead of giving them a random clown
+ name.
+ - balance: Lowered blob event earliest start from 1 hour to 40 minutes (ergo one
+ third), and the required player population from 40 to 35.
+ - bugfix: Several fixes and QoL for dullahans. They can see and hear visible and
+ audible messages now, don't need a space helmet they can't wear anyway to be
+ space/temperature proof, can examine things through shiftclick, and, most of
+ all, fixed their head being unpickable. Fixed dullahans gibbing when revived
+ or had their limbs regenerated.
+ - bugfix: humans should now drop gibs when gibbed again.
+ - rscadd: synths (not to be confused with IPCs), android and corporate species,
+ as well as robotic simple mobs, will now spawn robotic giblets instead of organic
+ ones.
+ - bugfix: You can't wear dakimakuras in any other inappropriate slots save for the
+ back slot anymore, degenerates.
+ - bugfix: Insert snarky remark about clock welders actually displaying the welder
+ flame overlay when turned on now here.
+ - balance: Minor ninja tweaks and stealth nerfs. The stealth penalty for the many
+ combat-related actions, bumping and now teleporting/dashing or firing guns has
+ been increased a by a third. There is now a cooldown of 5 seconds on toggling
+ stealth as well as a slighty slowed stealth in/out animation.
+ - imageadd: Ported slighty better matchbox sprites from CEV-Eris, also resprited
+ cigar boxes myself.
+ - bugfix: Fixed abductors/abductees objectives by porting an objective code.
+ - bugfix: Riding component fix
+ - bugfix: fixing a few runtimes on lightgeists, libido trait, rcd, one admin transformation
+ topic, chem dispensers, glowing robotic eyes...
+ - imageadd: Porting CEV-eris delivery packages sprites and dunking the old syndie
+ cybernetics box sprite.
+ - bugfix: Certain objects shouldn't be able to become radioactive because of a bitflag
+ that previously was checked nowhere in the code anymore.
+ - rscadd: Added a new PDA reskin, sprites from CEV-Eris
+ - rscadd: Clock cult starts with some spare vitality matrix charge scaled of the
+ number of starter servants.
+ - balance: Made the vitality matrix sigil slighty more visible, also allowed conversion
+ runes to heal fresh converts at the cost of some vitality charge.
+ - bugfix: 'Crawling won''t save you from the wrath of ocular wardens and pressure
+ sensors anymore, heretics. fix: Pressure sensors are no more triggered by floating/flying
+ mobs.'
+ - bugfix: Strawberry milk and tea have sprites now.
+ - bugfix: Fixed the Aux base camera door settings and toggle window type actions.
+ Also enabling the user to modify both door access and type.
+ - imageadd: Improved the two grayscale towel item sprites a little.
+ - bugfix: Fixed towels onmob suit overlays. Again.
+ - spellcheck: Fixed some reagents taste descriptions.
+ - bugfix: Fixed hidden random event reports only priting a paper message without
+ sending the message to the consoles' message list.
+ - bugfix: Rosary beads prayer now works on non-carbon mobs too, and won't break
+ when performed on a monkey or other humanoids.
+ - tweak: You can flagellate people with rosary beads on harm intent. It's even mediocrer
+ than the sord though.
+ - tweak: Moved the `Stealth and Camouflage Items` uplink category next to `Devices
+ and Tools`.
+ - bugfix: Deleted a duplicate phatom thief mask entry from the uplink.
+ - bugfix: Fixed missing delivery packages sprites
+ - bugfix: fixed a few minor issues with console frames building.
+ - bugfix: Wizards can use the teleport spell from their den once again.
+ - tweak: Wizards will now receive feedback messages when attempting to cast teleport
+ or use the warp whistle while in a no-teleport area.
+ - rscadd: New clockwork cultist, gondola, monkey and securitron cardboard cutouts.
+ - bugfix: Fixed aliens gasping randomly once in a while.
+ - bugfix: fixed superlube waterflower, my bad.
+ - bugfix: Fixed closing the aux base construction RCD's door access settings window
+ throwing you out of camera mode when closed.
+ - rscdel: Removed not functional aux base RCD's door type menu. Use airlock painters,
+ maybe.
+ - rscadd: Honkbot oil spills are of the slippery kind now. Honk.
+ - imageadd: local code scavenger finds forgotten slighty improved apc sprites left
+ buried in old dusty folders.
+ - bugfix: Seven old and otherwordly pAI holochassis icons have crawled their way
+ out of the modular citadel catacombs.
+ - bugfix: chem dispenser beakers end up in your hand yet again.
+ - bugfix: Bikehorns squeak yet again, the world is safe.
+ - bugfix: Cyborgs can now actually use cameras from a distance.
+ - bugfix: Suicides are yet again painful and instant and won't throw people in deep
+ crit from full health.
+ - bugfix: fixed rogue pixels on the energy gu- ahem blaster carbine... and a few
+ apc lights states being neigh-indistinguishable.
+ - bugfix: Fixed several "behind" layer tail sprites skipping areas normally covered
+ by bodyparts.
+ - bugfix: Morgues' original alert beeping sound has been restored, they no longer
+ go "ammunition depleted"
+ - bugfix: Fixed missing hypereutactic left inhand sprites.
+ - bugfix: Dying, ghosting, having your mind / ckey transferred to another mob, going
+ softcrit or otherwise unconscious now properly turn off combat mode.
+ - bugfix: combat mode can't be toggled on while non fully conscious anymore.
+ - bugfix: Fixed limbs' set_disabled NOT dropping your held items, updating your
+ hand slot inventory screen image, prompting chat messages and making your character
+ scream like a sissy.
+ - bugfix: Lusty xenomoprh maids will now actually clean tiles they travel onto yet
+ again.
+ - bugfix: Fixed double whitespace gap in human and AI examine. Fixed single whitespace
+ in carbon examine.
+ - rscdel: 'Removed a few useless supply packs: "Siezed" power cells, means of production
+ and promiscous organs.'
+ - tweak: Merged the synthetic blood supply pack into the standard blood supply pack,
+ effectively removing a random type blood pack in favor of two synthetic ones.
+ - tweak: "Merged together premium carpet pack n\xB01 and n\xB02 to hold one of each\
+ \ standard pattern."
+ - tweak: You can no longer estimate the amount of reagents found inside a damp rag.
+ - tweak: You can now squeeze a rag's reagents into another open container, as long
+ as the other one is not full.
+ - bugfix: Fixed ED-209 being unbuildable past the welding step.
+ - bugfix: Fixed ai displays status being reset to "Neutral" on login, regardless
+ of choice.
+ - bugfix: Fixed tinfoil hats giving random traumas.
+ Ghommie (original PR by Denton):
+ - rscadd: Added three new .38 ammo types. TRAC bullets, which embed a tracking implant
+ inside the target's body. The implant only lasts for five minutes and doesn't
+ work as a teleport beacon. Hot Shot bullets set targets on fire; Iceblox bullets
+ drastically lower the target's body temperature. They are available after researching
+ the Subdermal Implants node (TRAC) or Exotic Ammunition node (Hot Shot/Iceblox).
+ - tweak: Renamed the Technological Shells research node to Exotic Ammunition.
+ - code_imp: The "lifespan_postmortem" var now determines how long tracking implants
+ work after death.
+ - rscadd: .357 AP speedloaders can now be ordered from syndicate uplinks.
+ - balance: lowered the cost of uplink's .357 speedloaderd from 4 to 3.
+ Ghommie (original PR by nicbn and Menshin):
+ - bugfix: You can click on things that are under flaps or holo barriers.
+ Ghommie (original PRs by ShizCalev, CRTXBacon and Niknakflak):
+ - rscadd: Adds the intelliLantern, a big ol' spooky intelliCard skin
+ - rscadd: crafting recipe for the new intelliCard skin (requires 1 pumpkin, 1 intelliCard,
+ 5 cables and a wirecutter as a tool)
+ - tweak: changed the intelliTater crafting recipe to match the intelliLantern recipe
+ (but with a potato for obvious reasons) add:cute pai gameboy face :3
+ Ghommie, porting lot of PRs by MrDoomBringer, AnturK, nemvar and coiax.:
+ - admin: Admins can now launch supplypods the old, slightly quicker way as well
+ - bugfix: Centcom-launched supplypods will now properly delimb you (if they are
+ designated to do so) instead of touching you then literally yeeting all of your
+ internal organs out of your body.
+ - admin: Centcom can now specify if they want to yeet all of your organs out of
+ your body with a supplypod
+ - soundadd: Supplypods sound a bit nicer as the land now.
+ - admin: admins can now adjust the animation duration for centcom-launched supplypods
+ - admin: admins can adjust any sounds that are played as the supplypod lands
+ - bugfix: Reverse-Supplypods (the admin-launched ones) no longer stay behind after
+ rising up, and also auto-delete from centcom.
+ - admin: The centcom podlauncher now has better logging
+ - tweak: Admins can now allow ghosts to follow the delivery of Centcom-launched
+ supply pods
+ - admin: Admins can now use the Centcom Podlauncher to launch things without the
+ things looking like they're being sent inside a pod.
+ - admin: sparks will not generate if the quietLanding effect is on, for the centcom
+ podlauncher
+ - admin: makes input text clearer for the centcom podlauncher
+ - admin: New 'Podspawn' verb, which functions like 'Spawn', except any atoms movable
+ spawned will be dropped in via a no-damage, no-explosion Centcom supply pod.
+ - bugfix: Removed an oversight that made many obj/effect subtypes accidentally bombproof.
+ GrayRachnid:
+ - rscadd: Added saboteur syndicate engiborg
+ - tweak: changed cyborg tool icons and the secborg taser/laser icons.
+ - bugfix: Fixes golden toolbox missing inhand sprite
+ - rscadd: Added traumas
+ - rscadd: Added science powergame tool
+ - tweak: a few hearing args
+ - bugfix: fixed my mistakes
+ - tweak: tweaked the number of ingredients/pancakes you can stack.
+ Hatterhat:
+ - tweak: The Big Red Button now sets bomb timers to 2 seconds, instead of 5.
+ - tweak: Gloves of the North Star (not Hugs of the North Star) now use all their
+ intents very, very fast. This does not apply to grabs' click cooldown, nor shoving
+ people.
+ - rscadd: The seedvault/alien plant DNA manipulator can now be printed off with
+ Alien Biotechnology.
+ Iroquois-Pliskin:
+ - rscdel: Removed Clockwork Cult Surgical facility from Reebe
+ Jerry Derpington, baldest of the balds, and nemvar.:
+ - rscdel: Nanotrasen has lost communication to two away mission sites that contained
+ a beach for Nanotrasen employees.
+ - rscadd: Nanotrasen has been able to locate a new away mission site that ALSO has
+ a beach. Nanotrasen employees will be able to enjoy the beach after all!
+ - rscadd: Seashells have been added to the game.
+ KathrinBailey:
+ - rscadd: Two extra 'luxury' dorms rooms!
+ - rscadd: Gas miners to atmos.
+ - rscadd: Posters around the station.
+ - rscadd: Vacant room added to the Starboard Bow with it's own APC, above electrical
+ maintenance.
+ - rscadd: New trendy clothes to the locker room, giving variety and bringing fashion
+ back onto Nanotrasen stations.
+ - rscadd: Coloured bedsheet and towel bin.
+ - rscadd: Maid uniforms for the janitor.
+ - tweak: Completely reworked bar. Milk kegs added in bar office. The bar has been
+ changed for a homey restaurant feel just in time for Christmas! You can now
+ run it as an actual restaurant! Local Bartender Icktsie III loved it so much
+ he rolled around on the new floor smiling happily.
+ - tweak: Dorms rework. Fitness room now has lots of costumes and outfits.
+ - tweak: Junk removed from engineering, welding goggles added.
+ - tweak: Welding tools in engineering replaced with industrial welding tools.
+ - tweak: Package wrappers and hand labellers now in major departments.
+ - tweak: Cell charger moved from engineering lobby to the protolathe room, just
+ like how it is in all of the other maps and just where the cell charger is actually
+ needed.
+ - tweak: Library redesigned to have a private room and a 3x3 private study that
+ is cleaned up.
+ - tweak: Paper bins have gone big or gone home, with premium stationery scattered
+ around. Engineering and security now have a labeller and packaging supplies.
+ - bugfix: Dark spot top left of Botany fixed.
+ - bugfix: Huge galactic-sized dark spot in bar fixed.
+ - bugfix: Light replacers now are less horrifically overpowered and PTSD-inducing
+ for the server.
+ - bugfix: 'Fixes issue 9706: https://github.com/Citadel-Station-13/Citadel-Station-13/issues/9706
+ Part of maint getting hit by radstorms.
+
+ _Kathrin''s Box Beautification:_'
+ - rscadd: Ports TG's pews https://github.com/tgstation/tgstation/pull/42712
+ - rscadd: The first step of a corporate incursion of Space IKEA into Nanotrasen.
+ Kevinz000, Cruix, MrStonedOne, Denton, Kmc2000, Anturk, MrDoomBringer, Dennok, TheChosenEvilOne, Ghommie:
+ - rscadd: Added support for Multi-Z power, atmospherics and disposals
+ - bugfix: 'massive service department nerf: space can no longer be extra crispy.'
+ Knouli:
+ - rscadd: attack_self proc for the legion core which triggers a self-heal al la
+ the previous 'afterattack' proc, as if clicking on the character's own sprite
+ to self-heal
+ - rscadd: admin logging for all three use cases of legion core healing - afterattack,
+ attack_self, and implanted ui_action_click
+ Krysonism, Ghommie:
+ - rscadd: NT has made breakthroughs in ice cream science, ice creams can now be
+ flavoured with any reagent!
+ - tweak: The ice cream vat now accepts beakers.
+ - bugfix: Grape and Peach icecreams have scoop overlays yet again.
+ Linzolle:
+ - code_imp: butchering component update
+ - tweak: hat tossing can no longer knock hats off
+ - bugfix: strange reagent being unable to revive simplemobs
+ - rscadd: jitter animation and more clear text to strange reagent revival
+ Mickyy5:
+ - rscadd: Nanotrasen are now issuing Plasmamen with plasma in their survival boxes
+ MrJWhit:
+ - tweak: tweaked brain damage line
+ Naksu, ShizCalev:
+ - refactor: Refactored examine-code
+ - bugfix: Examining a human with a burned prosthetic limb will no longer tell you
+ that the limb is blistered.
+ - tweak: Items will now inform you if they are resistant to frost, fire, acid, and
+ lava when examined.
+ Owai-Seek:
+ - rscadd: '"silly" bounties'
+ - rscadd: '"gardenchef" bounties'
+ - rscdel: several bounties that require seriously good RNG to pull off.
+ - tweak: moved several chef and assistant bounties to silly and gardenchef
+ - balance: modified several bounty point rewards
+ - server: added new files "silly.dm" and "gardenchef.dm"
+ - rscadd: 15+ new crates for cargo
+ - tweak: organizes crates and moving them to proper categories
+ - rscdel: some dumb stuff like toner crates re
+ - rscadd: leg wraps and sweaters to clothesmate
+ - rscadd: screwdriver and cable coil to janidrobe
+ - rscadd: screwdriver and cable coil to janibelt whitelist (for fixing/placing light
+ fixtures)
+ - rscadd: monkey cube, syringe, enzyme, soy sauce, and cryoxadone to chef's vendor
+ (contraband and premium)
+ - rscadd: add cracker, beans, honey bars, lollipops, chocolate coin, and spider
+ lollipop to snack vendors (contraband and premium)
+ - rscadd: newspaper to loadout menu for bapping purposes
+ - rscdel: removed poppy pretzels from snack vendor premium
+ - rscadd: maid uniform (janimaid alt) to kinkmate.
+ - tweak: moves gear harness from premium to normal stock in kinkmate
+ - balance: re-balanced metal shield bounty
+ - rscadd: cryoxadone bottle (for use in chef vendor)
+ PersianXerxes:
+ - tweak: Reduces the grace period for meteors from a minimum of 5 and maximum of
+ 10 to 3 and 6 minutes respectively.
+ - rscadd: Adds a pair of VR sleepers to Box Station's permabrig
+ - rscadd: Adds a pair of VR sleepers to Delta Station's permabrig
+ - rscadd: Adds a pair of VR sleepers to Pubby Station's permabrig
+ - rscadd: Adds a pair of VR sleepers to Meta Station's permabrig
+ Putnam:
+ - bugfix: From-ghosts dynamic rulesets now actually listen to "required candidates"
+ - bugfix: Every dynamic-triggered event is now blacklisted from being triggered
+ by the random events system when dynamic can trigger them.
+ - rscadd: Dynamic voting now features extended, if recent rounds have been chaotic.
+ - tweak: Roundstart rulesets now scale on population ready rather than total population.
+ - bugfix: Threat log now accurately represents what actually used the threat.
+ - tweak: Verbose threat log (admin-only) now shows ALL threat level changes.
+ - bugfix: VR mobs can no longer be dynamic midround antags.
+ - bugfix: Personal closets can use anything that holds an ID card now.
+ Putnam3145:
+ - bugfix: traitors work now
+ - balance: Gas filters now push gas the same way volume pumps do.
+ - balance: Gas filters now won't clog if only one output is clogged.
+ - tweak: Glowsticks can no longer be radioactively contaminated (one more supermatter
+ contam exploit gone)
+ - bugfix: traitor removal is no longer borked
+ - rscadd: Dynamic voting
+ - config: Added DYNAMIC_VOTING to game_options
+ - tweak: SDGF now copies memories as well as antag data and factions.
+ - bugfix: Summon events now properly costs threat.
+ - bugfix: Refunded spells refund threat, too.
+ - refactor: Made wizard spells inherently have a requirement and cost.
+ - tweak: Meteor wave is no longer repeatable in dynamic.
+ - tweak: tweaked nuke ops
+ - bugfix: Organs can no longer be radioactively contaminated.
+ Robustin, Subject217:
+ - balance: The NukeOp Shuttle hull has been dramatically hardened. The walls are
+ now "R-Walls" with far greater explosion resistance.
+ - balance: The NukeOp Shuttle guns have been significantly buffed. They now rapidly
+ fire a new type of penetrator round, at a greater range, and have far greater
+ explosion resistance.
+ - balance: The nuclear device on the NukeOp Shuttle is now in an anchored state
+ by default, the Nuke can only be unanchored by inserting the disk and entering
+ the proper code.
+ - balance: Non-Syndicate cyborgs are now unable to access the NukeOp Shuttle Console.
+ - bugfix: You can now unanchor Nukes even when the floor under them has been destroyed
+ Seris02:
+ - rscadd: added sleeping carp hallucination
+ - rscadd: Centcom + Assistant's formal winter coat + loadout + narsian + ratvarian
+ winter coats
+ - rscadd: GPS location on examine
+ - bugfix: fixed the meteor hallucination
+ - tweak: tweaked the way the tapered penis looks
+ - rscadd: Added nine winter coats
+ - imageadd: added images for the winter coats
+ - tweak: adds the mining winter coat to mining wardrobes and mining lockers
+ ShizCalev:
+ - tweak: Ghosts can now see active AI cameras.
+ - bugfix: Fixed a couple of laser / energy guns never switching to the empty icon
+ despite being unable to fire.
+ Swindly:
+ - bugfix: Fixed MMIs not being able to use mecha equipment
+ - bugfix: Fixed MMIs not getting mecha mouse pointers
+ - bugfix: Fixed MMIs not getting medical HUDs in Odysseuses
+ - tweak: Brains can now switch to harm intent
+ Tetr4:
+ - bugfix: Turning a tile with gas effects into space now gets rid of the effects.
+ Trilbyspaceclone:
+ - rscadd: plastic trash cart crafting with plastic
+ - rscadd: wallets are known for now holding more items
+ - tweak: shades and clowns HP
+ - rscadd: six more crates, A barrel, A Loom, 40 cotton sheets, two sets of fruit
+ crates, raw lumber crate
+ - rscadd: All fermi chems, Boozes, Medical, food chems now sell
+ - rscadd: Loads more to sell - Mech gear, Cooking and more!
+ - tweak: Moved around the vaule of some things and removed elastic of most items
+ - balance: Rebreather implants will now loss vaule, Do to being just metal and glass
+ - balance: lowered how many chems are in lewd chem kegs to be around 150-100 as
+ well as the fancy booze kegs
+ - bugfix: bad returns and tools used
+ - rscadd: 8 new cargo crates!
+ - tweak: tablet cargo crate by -3k
+ - admin: Closes a bunch of issues
+ - server: updates changlogs and such
+ - bugfix: fixed a catnip not having sprites
+ - balance: Boh cant hold WEIGHT_CLASS_GIGANTIC, just Bulky. Makes katana, chainsaw
+ and base ball bat into bulky items so they may fit
+ - server: changes header to be more cit-like
+ - rscadd: new clothing for the hotel staff and a hat
+ Ty-the-Smonk:
+ - bugfix: You can now interact with self sustaining crossbreeds
+ Useroth:
+ - rscadd: Colored fairygrass variants.
+ - bugfix: Added a missing cherrybulb seedpack sprite
+ - bugfix: numbered storages now are sorted in a consistent way, instead of depending
+ on ordering of their contents var
+ - rscadd: strange seeds as a buyable traitor botanist item
+ - bugfix: resolves the issues revolving around blackpowder exploding where the reaction
+ happened, instead of where it actually is through making it explode instantly
+ - tweak: the explosion delay moved from blackpowder directly into bomb cherries,
+ to keep them functioning as intended
+ - rscadd: A bunch of newer tg plants
+ - rscadd: A bunch of newer tg plant traits
+ - rscadd: A couple of newer tg plant reagents
+ - bugfix: the new plants now properly get their reagents and reagent genes instead
+ of being empty with UNKNOWN reagents listed in the DNA machine
+ - rscadd: extradimensional oranges now contain haloperidol
+ - bugfix: extradimensional oranges now actually grow properly and give proper seeds.
+ Weblure:
+ - rscadd: Button added to slime console that prints out the hotkey commands to the
+ user. [Includes DMI update]
+ - rscadd: Shift-click a slime to pick it up, or the floor to drop all held slimes.
+ (Requires Basic Slime Console upgrade)
+ - rscadd: Ctrl-click a slime to scan it.
+ - rscadd: Alt-click a slime to feed it a potion. (Requires Advanced Slime Console
+ upgrade)
+ - rscadd: Ctrl-click on a dead monkey to recycle it, or the floor to place a new
+ monkey. (Requires Monkey Console upgrade)
+ - rscadd: If the console does not have the required upgrade, an error message will
+ print to the user.
+ - rscadd: You can now pick up a single slime from a pile, instead of all of them
+ at once.
+ - tweak: When recycling monkeys, the console will now report how many monkeys it
+ has (will not report decimal increases).
+ - tweak: Console now alerts you when you're out of monkeys and reports your current
+ decimal amount.
+ - tweak: Console messages are now styled consistently.
+ XDTM, ShizCalev, Naksu, Skoglol, cacogen, Rohesie (ported by Ghommie):
+ - tweak: Holding an ID in your hands uses it instead of your worn ID for authentication
+ purposes.
+ - tweak: If you don't have an ID in your id slot, the belt slot will be checked
+ as well.
+ - code_imp: small cleanup to id and bounty console html generation
+ - tweak: Hop console now hurts your eyes less. Red button text replaced with green.
+ - tweak: IDs with ID console access now go into the Confirm Identity slot by default
+ like they used to, similarly IDs without it go into the Target slot by default
+ again
+ - rscadd: Can easily swap out IDs by clicking the machine or the UI fields with
+ another ID
+ - rscadd: ID console now names which IDs are added/removed in its visible messages
+ - rscadd: Labels the ID slot fields when logged in so you know which is which
+ - tweak: Can use Job Management without an ID provided the console is logged in
+ (matches how the console now stays logged in even without an ID)
+ - tweak: Can log in without an ID in the Target field (matches how the machine now
+ stays logged in even after the ID is removed from the Target field)
+ - tweak: Cleans up UI slightly (had some duplicate/conflicting buttons)
+ - bugfix: Fixes ID console duping issues. Includes some ID containers, such as PDAs,
+ tablets and wallets, into the swapping behavior when an ID card is being removed
+ and the item is being held.
+ Xantholne:
+ - rscadd: New Berets for most heads and departments available in their autodrobes
+ or lockers
+ YakumoChen:
+ - imageadd: New AI Holograms and Displays! Ported from /vg/station.
+ actioninja:
+ - bugfix: med records no longer can eat id cards for no reason
+ - bugfix: Chat is properly sent to legacy window if goonchat fails to load again.
+ dapnee:
+ - bugfix: fixed closet initialisation being broken
+ - rscdel: emergency closets no longer have a 1% chance to delete themselves
+ - bugfix: Communications console window no longer updates, won't steal focus anymore.
+ - bugfix: Trimline neutral end exists now.
+ dzahlus:
+ - soundadd: added a new gun sounds
+ - sounddel: removed an old gun sounds
+ him:
+ - bugfix: hos and aeg guns now conform to le epic taser rework standards
+ kappa-sama:
+ - tweak: changed flavor text of alien tech on uplink
+ - imageadd: added TG's icons for traitor, russian, and golden revolver
+ kevinz000:
+ - rscadd: you can now choose never for this round for magical antags
+ - rscadd: Cargo has passive point generation again at 750 points/minute
+ - balance: Mindshield crate price increased from 3000 to 4000
+ - balance: Miasma sell price reduced from 15/mol to 4/mol
+ - balance: bluespace wizard apprentice now has blink instead of targeted area teleportation
+ - balance: Emagged medibots now charcoal toxinlovers.
+ - balance: disablers buffed 0.7 --> 0.6 speed 24 --> 28 damage
+ - balance: kinetic crushers no longer drop if you try to use it with one hand
+ - config: added multi_keyed_list, delimiter defaults to |.
+ - balance: Light pink extracts no longer speed you up. Instead, they give stamina
+ regeneration and free sprinting.
+ kiwedespars:
+ - rscdel: removed moth fluff coloring you like your wings
+ - balance: made insect not so bad.
+ nemvar:
+ - bugfix: You now get a message if your PDA explodes while you are holding it.
+ - tweak: The lavaland clown ruin has some new pranks ready.
+ - rscadd: Added a new loot item to the lavaland clown ruin.
+ - rscdel: Removed the slime core from said ruin.
+ - balance: The clown PDA now properly slips people on jogging move intent regardless
+ of fatigue. Honkmother's will.
+ nemvar, ShizCalev, Qustinnus/Floyd, Ghommie:
+ - rscadd: You can now unfasten the loom.
+ - tweak: it now takes 4 strands to make one piece of durathread cloth
+ - bugfix: Looms can now be attacked.
+ - rscadd: Durathread golem weaves his magic
+ - tweak: Supply ordered looms are unanchored. Bring a wrench.
+ r4d6:
+ - rscadd: Added Departements Winter Coats to the loadout list.
diff --git a/html/changelogs/AutoChangeLog-pr-10005.yml b/html/changelogs/AutoChangeLog-pr-10005.yml
deleted file mode 100644
index 728de78c37..0000000000
--- a/html/changelogs/AutoChangeLog-pr-10005.yml
+++ /dev/null
@@ -1,4 +0,0 @@
-author: "Commandersand"
-delete-after: True
-changes:
- - rscadd: "Added more stuff to loadout,check uniforms mask and backpack"
diff --git a/html/changelogs/AutoChangeLog-pr-10008.yml b/html/changelogs/AutoChangeLog-pr-10008.yml
deleted file mode 100644
index 9a4090ad28..0000000000
--- a/html/changelogs/AutoChangeLog-pr-10008.yml
+++ /dev/null
@@ -1,4 +0,0 @@
-author: "Seris02"
-delete-after: True
-changes:
- - rscadd: "added sleeping carp hallucination"
diff --git a/html/changelogs/AutoChangeLog-pr-10010.yml b/html/changelogs/AutoChangeLog-pr-10010.yml
deleted file mode 100644
index 2926093ee4..0000000000
--- a/html/changelogs/AutoChangeLog-pr-10010.yml
+++ /dev/null
@@ -1,5 +0,0 @@
-author: "Ghommie"
-delete-after: True
-changes:
- - bugfix: "Fixing implant cases being lost inside implant pads when trying to eject them with your active hand full."
- - tweak: "Moved the implant pad's case ejection from attack_hand() to AltClick(), added examination infos about it."
diff --git a/html/changelogs/AutoChangeLog-pr-10011.yml b/html/changelogs/AutoChangeLog-pr-10011.yml
new file mode 100644
index 0000000000..70d569699f
--- /dev/null
+++ b/html/changelogs/AutoChangeLog-pr-10011.yml
@@ -0,0 +1,4 @@
+author: "Arturlang"
+delete-after: True
+changes:
+ - rscadd: "Adds Bloodsuckers, beware."
diff --git a/html/changelogs/AutoChangeLog-pr-10016.yml b/html/changelogs/AutoChangeLog-pr-10016.yml
deleted file mode 100644
index 783b56ff0b..0000000000
--- a/html/changelogs/AutoChangeLog-pr-10016.yml
+++ /dev/null
@@ -1,10 +0,0 @@
-author: "Bhijn"
-delete-after: True
-changes:
- - code_imp: "Item mousedrop() now provides a return value indicating whether or not behavior has been overridden somehow."
- - bugfix: "Defibs now properly check that their loc is the same as the user for mousedrop() calls, meaning ghosts can no longer make you equip defibs. Plus extra sanity checks."
- - bugfix: "Pet carriers no longer attack turfs while trying to unload their contents."
- - bugfix: "Decks of cards now function as they originally intended when attempting to use their drag and drop behavior."
- - bugfix: "Paper bins and papercutters no longer act wonky when you're trying to pull a piece of paper from them."
- - bugfix: "Adds clothing drag n drop sanity checks."
- - bugfix: "Sythetic hats now have extra sanity checks"
diff --git a/html/changelogs/AutoChangeLog-pr-10017.yml b/html/changelogs/AutoChangeLog-pr-10017.yml
deleted file mode 100644
index a208dce4a6..0000000000
--- a/html/changelogs/AutoChangeLog-pr-10017.yml
+++ /dev/null
@@ -1,5 +0,0 @@
-author: "Putnam3145"
-delete-after: True
-changes:
- - balance: "Gas filters now push gas the same way volume pumps do."
- - balance: "Gas filters now won't clog if only one output is clogged."
diff --git a/html/changelogs/AutoChangeLog-pr-10019.yml b/html/changelogs/AutoChangeLog-pr-10019.yml
deleted file mode 100644
index b28d90e39e..0000000000
--- a/html/changelogs/AutoChangeLog-pr-10019.yml
+++ /dev/null
@@ -1,4 +0,0 @@
-author: "Seris02"
-delete-after: True
-changes:
- - rscadd: "Centcom + Assistant's formal winter coat + loadout + narsian + ratvarian winter coats"
diff --git a/html/changelogs/AutoChangeLog-pr-10021.yml b/html/changelogs/AutoChangeLog-pr-10021.yml
deleted file mode 100644
index 8d59963e67..0000000000
--- a/html/changelogs/AutoChangeLog-pr-10021.yml
+++ /dev/null
@@ -1,4 +0,0 @@
-author: "Putnam3145"
-delete-after: True
-changes:
- - tweak: "Glowsticks can no longer be radioactively contaminated (one more supermatter contam exploit gone)"
diff --git a/html/changelogs/AutoChangeLog-pr-10025.yml b/html/changelogs/AutoChangeLog-pr-10025.yml
deleted file mode 100644
index b690e4e7b5..0000000000
--- a/html/changelogs/AutoChangeLog-pr-10025.yml
+++ /dev/null
@@ -1,4 +0,0 @@
-author: "Linzolle"
-delete-after: True
-changes:
- - code_imp: "butchering component update"
diff --git a/html/changelogs/AutoChangeLog-pr-10026.yml b/html/changelogs/AutoChangeLog-pr-10026.yml
new file mode 100644
index 0000000000..6e8062874b
--- /dev/null
+++ b/html/changelogs/AutoChangeLog-pr-10026.yml
@@ -0,0 +1,4 @@
+author: "Linzolle"
+delete-after: True
+changes:
+ - rscadd: "neck slice. harm intent someone's head while they are unconscious or in a neck grab to make them bleed uncontrollably."
diff --git a/html/changelogs/AutoChangeLog-pr-10031.yml b/html/changelogs/AutoChangeLog-pr-10031.yml
deleted file mode 100644
index 707cb80f66..0000000000
--- a/html/changelogs/AutoChangeLog-pr-10031.yml
+++ /dev/null
@@ -1,4 +0,0 @@
-author: "Ghommie"
-delete-after: True
-changes:
- - bugfix: "Fixed holodeck sleepers leaving sleeper buffers behind when deleted."
diff --git a/html/changelogs/AutoChangeLog-pr-10033.yml b/html/changelogs/AutoChangeLog-pr-10033.yml
deleted file mode 100644
index 0a2fa85469..0000000000
--- a/html/changelogs/AutoChangeLog-pr-10033.yml
+++ /dev/null
@@ -1,5 +0,0 @@
-author: "Ghommie"
-delete-after: True
-changes:
- - bugfix: "Fixed traitor codewords highlight and some other hear signal hooks spans highlight (phobias, split personality, hypnosis) or modifiers (mind echo)"
- - bugfix: "Fixed traitor codewords highlight not passing down with the mind datum and stickying to the first mob."
diff --git a/html/changelogs/AutoChangeLog-pr-10034.yml b/html/changelogs/AutoChangeLog-pr-10034.yml
deleted file mode 100644
index d954926e38..0000000000
--- a/html/changelogs/AutoChangeLog-pr-10034.yml
+++ /dev/null
@@ -1,4 +0,0 @@
-author: "Ghommie"
-delete-after: True
-changes:
- - spellcheck: "Fixed the incongruent bone satchel description."
diff --git a/html/changelogs/AutoChangeLog-pr-10037.yml b/html/changelogs/AutoChangeLog-pr-10037.yml
new file mode 100644
index 0000000000..b0f0501516
--- /dev/null
+++ b/html/changelogs/AutoChangeLog-pr-10037.yml
@@ -0,0 +1,6 @@
+author: "Ghommie"
+delete-after: True
+changes:
+ - bugfix: "Fixed hulks, sleeping carp users, pacifists and people with chunky fingers being able to unrestrictly use gun and pneumatic cannon circuit assemblies."
+ - bugfix: "Fixed gun circuit assemblies being only usable by human mobs."
+ - balance: "Doubled the locomotion circuit external cooldown, thus halving the movable assemblies' movespeed."
diff --git a/html/changelogs/AutoChangeLog-pr-10038.yml b/html/changelogs/AutoChangeLog-pr-10038.yml
deleted file mode 100644
index 40ba8ee11b..0000000000
--- a/html/changelogs/AutoChangeLog-pr-10038.yml
+++ /dev/null
@@ -1,4 +0,0 @@
-author: "Trilbyspaceclone"
-delete-after: True
-changes:
- - rscadd: "plastic trash cart crafting with plastic"
diff --git a/html/changelogs/AutoChangeLog-pr-10042.yml b/html/changelogs/AutoChangeLog-pr-10042.yml
deleted file mode 100644
index cabf698030..0000000000
--- a/html/changelogs/AutoChangeLog-pr-10042.yml
+++ /dev/null
@@ -1,4 +0,0 @@
-author: "Ghommie"
-delete-after: True
-changes:
- - bugfix: "Fixed sofa overlays doing nothing, because their layer wasn't properly set."
diff --git a/html/changelogs/AutoChangeLog-pr-10043.yml b/html/changelogs/AutoChangeLog-pr-10043.yml
deleted file mode 100644
index 9bd7fdced0..0000000000
--- a/html/changelogs/AutoChangeLog-pr-10043.yml
+++ /dev/null
@@ -1,4 +0,0 @@
-author: "Arturlang"
-delete-after: True
-changes:
- - tweak: "PDA catridges cant be irradiated anymore."
diff --git a/html/changelogs/AutoChangeLog-pr-10044.yml b/html/changelogs/AutoChangeLog-pr-10044.yml
new file mode 100644
index 0000000000..8d1782c3a8
--- /dev/null
+++ b/html/changelogs/AutoChangeLog-pr-10044.yml
@@ -0,0 +1,6 @@
+author: "Ghommie"
+delete-after: True
+changes:
+ - tweak: "Made wooden cabinet/closets... actually made of wood."
+ - tweak: "Wooden cabinets are now deconstructable with a screwdriver."
+ - tweak: "Deconstruction of large crates and other closet subtypes deconstructable with tools other than the welder is no longer instant."
diff --git a/html/changelogs/AutoChangeLog-pr-10045.yml b/html/changelogs/AutoChangeLog-pr-10045.yml
deleted file mode 100644
index 39fdba4fda..0000000000
--- a/html/changelogs/AutoChangeLog-pr-10045.yml
+++ /dev/null
@@ -1,4 +0,0 @@
-author: "Trilbyspaceclone"
-delete-after: True
-changes:
- - rscadd: "wallets are known for now holding more items"
diff --git a/html/changelogs/AutoChangeLog-pr-10049.yml b/html/changelogs/AutoChangeLog-pr-10049.yml
deleted file mode 100644
index 34d8c2947a..0000000000
--- a/html/changelogs/AutoChangeLog-pr-10049.yml
+++ /dev/null
@@ -1,5 +0,0 @@
-author: "Useroth"
-delete-after: True
-changes:
- - rscadd: "Colored fairygrass variants."
- - bugfix: "Added a missing cherrybulb seedpack sprite"
diff --git a/html/changelogs/AutoChangeLog-pr-10050.yml b/html/changelogs/AutoChangeLog-pr-10050.yml
new file mode 100644
index 0000000000..c736ded339
--- /dev/null
+++ b/html/changelogs/AutoChangeLog-pr-10050.yml
@@ -0,0 +1,5 @@
+author: "Ghommie"
+delete-after: True
+changes:
+ - tweak: "You shouldn't be able to target objects you can't see (excluding darkness) with the ARCD and RLD"
+ - tweak: "The admin RCD is ranged too, just like the ARCD."
diff --git a/html/changelogs/AutoChangeLog-pr-10051.yml b/html/changelogs/AutoChangeLog-pr-10051.yml
new file mode 100644
index 0000000000..0d7d274891
--- /dev/null
+++ b/html/changelogs/AutoChangeLog-pr-10051.yml
@@ -0,0 +1,4 @@
+author: "kappa-sama"
+delete-after: True
+changes:
+ - balance: "legion drops more crates now"
diff --git a/html/changelogs/AutoChangeLog-pr-10053.yml b/html/changelogs/AutoChangeLog-pr-10053.yml
new file mode 100644
index 0000000000..36d392d8f8
--- /dev/null
+++ b/html/changelogs/AutoChangeLog-pr-10053.yml
@@ -0,0 +1,4 @@
+author: "Ghommie"
+delete-after: True
+changes:
+ - bugfix: "Fixed welding, thirteen loko, welding and wraith spectacles not blinding people as expected. Thank you all whomst reported this issue in the suggestions box channel instead of the github repository's issues section, very smart!"
diff --git a/html/changelogs/AutoChangeLog-pr-10054.yml b/html/changelogs/AutoChangeLog-pr-10054.yml
new file mode 100644
index 0000000000..0dc3b36618
--- /dev/null
+++ b/html/changelogs/AutoChangeLog-pr-10054.yml
@@ -0,0 +1,5 @@
+author: "kappa-sama"
+delete-after: True
+changes:
+ - balance: ".357 speedloaders in autolathes are now individual bullets instead, speedloaders are now illegal tech, costs less total metal to make 7 bullets than a previous speedloader. 7.62mm bullets in autolathe when hacked and costs more metal to make 5 7.62mm bullets than getting a clip from the seclathe."
+ - tweak: "mentions that you can refill speedloaders on .357 uplink description"
diff --git a/html/changelogs/AutoChangeLog-pr-10056.yml b/html/changelogs/AutoChangeLog-pr-10056.yml
deleted file mode 100644
index 05c8f706c1..0000000000
--- a/html/changelogs/AutoChangeLog-pr-10056.yml
+++ /dev/null
@@ -1,4 +0,0 @@
-author: "nemvar"
-delete-after: True
-changes:
- - bugfix: "You now get a message if your PDA explodes while you are holding it."
diff --git a/html/changelogs/AutoChangeLog-pr-10057.yml b/html/changelogs/AutoChangeLog-pr-10057.yml
new file mode 100644
index 0000000000..be285bfc57
--- /dev/null
+++ b/html/changelogs/AutoChangeLog-pr-10057.yml
@@ -0,0 +1,5 @@
+author: "Ghommie"
+delete-after: True
+changes:
+ - bugfix: "Fixed on_mob eyes overlays not updating properly in certain cases."
+ - bugfix: "Fixed deconversion from bloodshot eyes blood cult resetting your eyes' color to pitch black instead of their previous color, more or less."
diff --git a/html/changelogs/AutoChangeLog-pr-10058.yml b/html/changelogs/AutoChangeLog-pr-10058.yml
new file mode 100644
index 0000000000..6f9a985765
--- /dev/null
+++ b/html/changelogs/AutoChangeLog-pr-10058.yml
@@ -0,0 +1,4 @@
+author: "Ghommie"
+delete-after: True
+changes:
+ - balance: "Spinfusor nerf: Upped the casing and ammo box size by one step, removed the projectile's dismemberment value (explosions can still rip a limb or two off), halved the ammo box capacity, reduced the spinfusor ammo supply pack contents from 32 to 8, removed the casing's ability to explode when thrown."
diff --git a/html/changelogs/AutoChangeLog-pr-10059.yml b/html/changelogs/AutoChangeLog-pr-10059.yml
new file mode 100644
index 0000000000..e9f89c18a2
--- /dev/null
+++ b/html/changelogs/AutoChangeLog-pr-10059.yml
@@ -0,0 +1,4 @@
+author: "lolman360"
+delete-after: True
+changes:
+ - rscadd: "Added ability to pick up certain simplemobs."
diff --git a/html/changelogs/AutoChangeLog-pr-10067.yml b/html/changelogs/AutoChangeLog-pr-10067.yml
new file mode 100644
index 0000000000..ac65487761
--- /dev/null
+++ b/html/changelogs/AutoChangeLog-pr-10067.yml
@@ -0,0 +1,5 @@
+author: "Sishen1542"
+delete-after: True
+changes:
+ - rscadd: "Clicking a pack of seeds with a pen allows you to set the plant's name, description and the pack of seeds' description. Useful for differentiating genetically modified plants. These changes will persist through different generations of the plant."
+ - rscadd: "Hydroponics trays update their name and description to reflect the plant inside them. They revert to default when emptied."
diff --git a/html/changelogs/AutoChangeLog-pr-10068.yml b/html/changelogs/AutoChangeLog-pr-10068.yml
new file mode 100644
index 0000000000..39b2c37c28
--- /dev/null
+++ b/html/changelogs/AutoChangeLog-pr-10068.yml
@@ -0,0 +1,5 @@
+author: "Fikou"
+delete-after: True
+changes:
+ - tweak: "the windup toolbox now has some more \"realistic\" sounds"
+ - bugfix: "the windup toolbox now rumbles again"
diff --git a/html/changelogs/AutoChangeLog-pr-10071.yml b/html/changelogs/AutoChangeLog-pr-10071.yml
new file mode 100644
index 0000000000..3632bdfa86
--- /dev/null
+++ b/html/changelogs/AutoChangeLog-pr-10071.yml
@@ -0,0 +1,4 @@
+author: "Ghommie"
+delete-after: True
+changes:
+ - bugfix: "Fixes bubblegum's death not unlocking the arena shuttle buyment."
diff --git a/html/changelogs/AutoChangeLog-pr-10072.yml b/html/changelogs/AutoChangeLog-pr-10072.yml
new file mode 100644
index 0000000000..9a6f45e61e
--- /dev/null
+++ b/html/changelogs/AutoChangeLog-pr-10072.yml
@@ -0,0 +1,5 @@
+author: "Useroth"
+delete-after: True
+changes:
+ - rscadd: "bamboo which can be used to build punji sticks/ blowguns available as a sugarcane mutation or in exotic seed crate"
+ - tweak: "changed the sugar cane growth stages because fuck if I know why, but it was in the PR"
diff --git a/html/changelogs/AutoChangeLog-pr-10076.yml b/html/changelogs/AutoChangeLog-pr-10076.yml
new file mode 100644
index 0000000000..0e04ceddbc
--- /dev/null
+++ b/html/changelogs/AutoChangeLog-pr-10076.yml
@@ -0,0 +1,4 @@
+author: "Ghommie"
+delete-after: True
+changes:
+ - bugfix: "Fixed alien tech node not being unlockable with subtypes of the accepted items."
diff --git a/html/changelogs/AutoChangeLog-pr-10079.yml b/html/changelogs/AutoChangeLog-pr-10079.yml
new file mode 100644
index 0000000000..a729b1bc56
--- /dev/null
+++ b/html/changelogs/AutoChangeLog-pr-10079.yml
@@ -0,0 +1,4 @@
+author: "Ghommie"
+delete-after: True
+changes:
+ - bugfix: "Fixed reactive armor onmob overlays not updating when toggled and reactive teleport armor still using forceMove() instead of do_teleport()"
diff --git a/html/changelogs/AutoChangeLog-pr-10082.yml b/html/changelogs/AutoChangeLog-pr-10082.yml
new file mode 100644
index 0000000000..e5c669f798
--- /dev/null
+++ b/html/changelogs/AutoChangeLog-pr-10082.yml
@@ -0,0 +1,4 @@
+author: "kevinz000"
+delete-after: True
+changes:
+ - rscadd: "Launchpads can now take number inputs for offsets rather than just buttons."
diff --git a/html/changelogs/AutoChangeLog-pr-10083.yml b/html/changelogs/AutoChangeLog-pr-10083.yml
new file mode 100644
index 0000000000..c60c3fea36
--- /dev/null
+++ b/html/changelogs/AutoChangeLog-pr-10083.yml
@@ -0,0 +1,4 @@
+author: "Ghommie"
+delete-after: True
+changes:
+ - bugfix: "Fixed space hermit asteroid rocks unintendedly spawning airless asteroid turf when mined, save for the perimeter."
diff --git a/html/changelogs/AutoChangeLog-pr-10085.yml b/html/changelogs/AutoChangeLog-pr-10085.yml
new file mode 100644
index 0000000000..a82f052fed
--- /dev/null
+++ b/html/changelogs/AutoChangeLog-pr-10085.yml
@@ -0,0 +1,6 @@
+author: "Ghommie"
+delete-after: True
+changes:
+ - bugfix: "Fixes reviver implant having been a crapshot ever since soft-crit was introduced years ago."
+ - tweak: "Added a \"convalescence\" time (about 15 seconds) after the user is out of unconsciousbess/crit to ensure they are properly stabilized."
+ - tweak: "Added a 15 minutes hardcap for accumulated revive cooldown (equivalent to 150 points of brute or burn healed) above which the implant starts cooling down regardless of user's conditions."
diff --git a/html/changelogs/AutoChangeLog-pr-10086.yml b/html/changelogs/AutoChangeLog-pr-10086.yml
new file mode 100644
index 0000000000..08dff8ee5c
--- /dev/null
+++ b/html/changelogs/AutoChangeLog-pr-10086.yml
@@ -0,0 +1,4 @@
+author: "Ghommie"
+delete-after: True
+changes:
+ - bugfix: "Fixed AI core displays I may have broken with my coding extravaganza."
diff --git a/html/changelogs/AutoChangeLog-pr-10090.yml b/html/changelogs/AutoChangeLog-pr-10090.yml
new file mode 100644
index 0000000000..924d83b65e
--- /dev/null
+++ b/html/changelogs/AutoChangeLog-pr-10090.yml
@@ -0,0 +1,6 @@
+author: "Hatterhat"
+delete-after: True
+changes:
+ - rscadd: "Regenerative nanites, a \"chemical\" used in the combat stimulant injector. Actually quite stimulating, and not bad in a pinch for a nuclear operative. Check the Combat Medic Kit!"
+ - tweak: "The Combat Medic Kit now has an advanced health analyzer and medisprays instead of patches and a chloral syringe."
+ - balance: "The Advanced Syndicate Surgery Duffelbag or whatever it was doesn't get the better injector, because nobody uses it and so nobody's bothered to update it."
diff --git a/html/changelogs/AutoChangeLog-pr-10093.yml b/html/changelogs/AutoChangeLog-pr-10093.yml
new file mode 100644
index 0000000000..e692ed5d2a
--- /dev/null
+++ b/html/changelogs/AutoChangeLog-pr-10093.yml
@@ -0,0 +1,15 @@
+author: "Trilbyspaceclone"
+delete-after: True
+changes:
+ - rscadd: "ports all the new donuts, burgars, and chicken stuff from RG"
+ - rscadd: "ports new snowcone"
+ - rscadd: "ports grill"
+ - rscadd: "ports beakfeast tag/mood lit as TG has it"
+ - rscadd: "ports all the amazing new sprites"
+ - tweak: "ports crafting for many things like snowcones needing water"
+ - balance: "ports of many craftings"
+ - soundadd: "lowers fryers sound"
+ - imageadd: "ported icons for new food/grill"
+ - imagedel: "ports the deletion of some icons and images"
+ - spellcheck: "ports a spell check for the snowcones"
+ - code_imp: "ports fixes for stuff I didnt know were even broken with snowcones"
diff --git a/html/changelogs/AutoChangeLog-pr-10094.yml b/html/changelogs/AutoChangeLog-pr-10094.yml
new file mode 100644
index 0000000000..ee9513489d
--- /dev/null
+++ b/html/changelogs/AutoChangeLog-pr-10094.yml
@@ -0,0 +1,4 @@
+author: "Trilbyspaceclone"
+delete-after: True
+changes:
+ - bugfix: "coder cat failers to push the last commit from year(s) ago"
diff --git a/html/changelogs/AutoChangeLog-pr-10096.yml b/html/changelogs/AutoChangeLog-pr-10096.yml
new file mode 100644
index 0000000000..0089c11a9d
--- /dev/null
+++ b/html/changelogs/AutoChangeLog-pr-10096.yml
@@ -0,0 +1,4 @@
+author: "kevinz000"
+delete-after: True
+changes:
+ - balance: "nanites no longer spread through air blocking objects"
diff --git a/html/changelogs/AutoChangeLog-pr-10099.yml b/html/changelogs/AutoChangeLog-pr-10099.yml
new file mode 100644
index 0000000000..9ad4bfdfc2
--- /dev/null
+++ b/html/changelogs/AutoChangeLog-pr-10099.yml
@@ -0,0 +1,4 @@
+author: "Ghommie"
+delete-after: True
+changes:
+ - bugfix: "Fixed a few holo barriers lacking transparency."
diff --git a/html/changelogs/AutoChangeLog-pr-9614.yml b/html/changelogs/AutoChangeLog-pr-10101.yml
similarity index 61%
rename from html/changelogs/AutoChangeLog-pr-9614.yml
rename to html/changelogs/AutoChangeLog-pr-10101.yml
index ae47ffb4a3..059c8b2d85 100644
--- a/html/changelogs/AutoChangeLog-pr-9614.yml
+++ b/html/changelogs/AutoChangeLog-pr-10101.yml
@@ -1,4 +1,4 @@
author: "Trilbyspaceclone"
delete-after: True
changes:
- - tweak: "shades and clowns HP"
+ - admin: "Updates the changlogs"
diff --git a/html/changelogs/AutoChangeLog-pr-10108.yml b/html/changelogs/AutoChangeLog-pr-10108.yml
new file mode 100644
index 0000000000..67c6396763
--- /dev/null
+++ b/html/changelogs/AutoChangeLog-pr-10108.yml
@@ -0,0 +1,4 @@
+author: "DeltaFire15"
+delete-after: True
+changes:
+ - balance: "Clock cult kindle no longer cares about oxygen damage"
diff --git a/html/changelogs/AutoChangeLog-pr-10111.yml b/html/changelogs/AutoChangeLog-pr-10111.yml
new file mode 100644
index 0000000000..0a80f01eef
--- /dev/null
+++ b/html/changelogs/AutoChangeLog-pr-10111.yml
@@ -0,0 +1,4 @@
+author: "kappa-sama"
+delete-after: True
+changes:
+ - bugfix: "you can now strip people while aggrograbbing or higher"
diff --git a/html/changelogs/AutoChangeLog-pr-10114.yml b/html/changelogs/AutoChangeLog-pr-10114.yml
new file mode 100644
index 0000000000..f413760ff9
--- /dev/null
+++ b/html/changelogs/AutoChangeLog-pr-10114.yml
@@ -0,0 +1,4 @@
+author: "r4d6"
+delete-after: True
+changes:
+ - rscadd: "Added a N2O pressure tank"
diff --git a/html/changelogs/AutoChangeLog-pr-10115.yml b/html/changelogs/AutoChangeLog-pr-10115.yml
new file mode 100644
index 0000000000..f7a60e4911
--- /dev/null
+++ b/html/changelogs/AutoChangeLog-pr-10115.yml
@@ -0,0 +1,5 @@
+author: "Useroth"
+delete-after: True
+changes:
+ - rscadd: "New lavaland ruin: Pulsating tumor"
+ - rscadd: "New class of lavaland mobs, a bit weaker than megafauna but still stronger than most of what you normally see"
diff --git a/html/changelogs/AutoChangeLog-pr-10116.yml b/html/changelogs/AutoChangeLog-pr-10116.yml
new file mode 100644
index 0000000000..70c1b4590d
--- /dev/null
+++ b/html/changelogs/AutoChangeLog-pr-10116.yml
@@ -0,0 +1,4 @@
+author: "Putnam"
+delete-after: True
+changes:
+ - bugfix: "acute hepatic pharmacokinesis now works if you already have relevant genitals"
diff --git a/html/changelogs/AutoChangeLog-pr-10120.yml b/html/changelogs/AutoChangeLog-pr-10120.yml
new file mode 100644
index 0000000000..5777519d83
--- /dev/null
+++ b/html/changelogs/AutoChangeLog-pr-10120.yml
@@ -0,0 +1,4 @@
+author: "kevinz000"
+delete-after: True
+changes:
+ - rscadd: "Night vision readded as a darkness dampening effect rather than darksight."
diff --git a/html/changelogs/AutoChangeLog-pr-10121.yml b/html/changelogs/AutoChangeLog-pr-10121.yml
new file mode 100644
index 0000000000..38a91fcc01
--- /dev/null
+++ b/html/changelogs/AutoChangeLog-pr-10121.yml
@@ -0,0 +1,4 @@
+author: "kappa-sama"
+delete-after: True
+changes:
+ - rscadd: "plasmafist to wizard"
diff --git a/html/changelogs/AutoChangeLog-pr-10122.yml b/html/changelogs/AutoChangeLog-pr-10122.yml
new file mode 100644
index 0000000000..4d503dc2be
--- /dev/null
+++ b/html/changelogs/AutoChangeLog-pr-10122.yml
@@ -0,0 +1,4 @@
+author: "kevinz000"
+delete-after: True
+changes:
+ - rscdel: "conveyors can only stack items on tiles to 150 now."
diff --git a/html/changelogs/AutoChangeLog-pr-10126.yml b/html/changelogs/AutoChangeLog-pr-10126.yml
new file mode 100644
index 0000000000..6cf568ca70
--- /dev/null
+++ b/html/changelogs/AutoChangeLog-pr-10126.yml
@@ -0,0 +1,4 @@
+author: "Putnam3145"
+delete-after: True
+changes:
+ - balance: "Buffed HE pipes by making them realistically radiate away heat."
diff --git a/html/changelogs/AutoChangeLog-pr-9742.yml b/html/changelogs/AutoChangeLog-pr-10128.yml
similarity index 55%
rename from html/changelogs/AutoChangeLog-pr-9742.yml
rename to html/changelogs/AutoChangeLog-pr-10128.yml
index ef5822e959..89bca26a76 100644
--- a/html/changelogs/AutoChangeLog-pr-9742.yml
+++ b/html/changelogs/AutoChangeLog-pr-10128.yml
@@ -1,4 +1,4 @@
author: "Seris02"
delete-after: True
changes:
- - rscadd: "GPS location on examine"
+ - rscadd: "the clowns headset"
diff --git a/html/changelogs/AutoChangeLog-pr-10130.yml b/html/changelogs/AutoChangeLog-pr-10130.yml
new file mode 100644
index 0000000000..1f6ba6ac6a
--- /dev/null
+++ b/html/changelogs/AutoChangeLog-pr-10130.yml
@@ -0,0 +1,4 @@
+author: "kappa-sama"
+delete-after: True
+changes:
+ - code_imp: "modular is gone"
diff --git a/html/changelogs/AutoChangeLog-pr-9663.yml b/html/changelogs/AutoChangeLog-pr-10132.yml
similarity index 57%
rename from html/changelogs/AutoChangeLog-pr-9663.yml
rename to html/changelogs/AutoChangeLog-pr-10132.yml
index ad11e40878..d8755d2b90 100644
--- a/html/changelogs/AutoChangeLog-pr-9663.yml
+++ b/html/changelogs/AutoChangeLog-pr-10132.yml
@@ -1,4 +1,4 @@
author: "Trilbyspaceclone"
delete-after: True
changes:
- - bugfix: "bad returns and tools used"
+ - tweak: "meat hook from HUGE to bulky"
diff --git a/html/changelogs/AutoChangeLog-pr-10137.yml b/html/changelogs/AutoChangeLog-pr-10137.yml
new file mode 100644
index 0000000000..63678d4425
--- /dev/null
+++ b/html/changelogs/AutoChangeLog-pr-10137.yml
@@ -0,0 +1,4 @@
+author: "KeRSedChaplain"
+delete-after: True
+changes:
+ - soundadd: "Extends the file \"deltakalaxon.ogg\" to a 38 second .ogg."
diff --git a/html/changelogs/AutoChangeLog-pr-10140.yml b/html/changelogs/AutoChangeLog-pr-10140.yml
new file mode 100644
index 0000000000..d5e33fa02d
--- /dev/null
+++ b/html/changelogs/AutoChangeLog-pr-10140.yml
@@ -0,0 +1,4 @@
+author: "Putnam3145"
+delete-after: True
+changes:
+ - bugfix: "Dynamic has a (totally unused for any relevant purpose) roundstart report now."
diff --git a/html/changelogs/AutoChangeLog-pr-10141.yml b/html/changelogs/AutoChangeLog-pr-10141.yml
new file mode 100644
index 0000000000..5f0bfe2267
--- /dev/null
+++ b/html/changelogs/AutoChangeLog-pr-10141.yml
@@ -0,0 +1,4 @@
+author: "Putnam3145"
+delete-after: True
+changes:
+ - admin: "A whole bunch of dynamic data is now available for statbus"
diff --git a/html/changelogs/AutoChangeLog-pr-9713.yml b/html/changelogs/AutoChangeLog-pr-10142.yml
similarity index 53%
rename from html/changelogs/AutoChangeLog-pr-9713.yml
rename to html/changelogs/AutoChangeLog-pr-10142.yml
index fcefecf94d..aba2675550 100644
--- a/html/changelogs/AutoChangeLog-pr-9713.yml
+++ b/html/changelogs/AutoChangeLog-pr-10142.yml
@@ -1,4 +1,4 @@
author: "Trilbyspaceclone"
delete-after: True
changes:
- - bugfix: "fixed a catnip not having sprites"
+ - tweak: "CE hardsuit is now more rad-proof"
diff --git a/html/changelogs/AutoChangeLog-pr-10143.yml b/html/changelogs/AutoChangeLog-pr-10143.yml
new file mode 100644
index 0000000000..45dfe225c4
--- /dev/null
+++ b/html/changelogs/AutoChangeLog-pr-10143.yml
@@ -0,0 +1,4 @@
+author: "Putnam3145"
+delete-after: True
+changes:
+ - bugfix: "Dynamic from-ghost antags no longer double dip on threat refunds when the mode fails due to not enough applications."
diff --git a/html/changelogs/AutoChangeLog-pr-10144.yml b/html/changelogs/AutoChangeLog-pr-10144.yml
new file mode 100644
index 0000000000..6b175b149b
--- /dev/null
+++ b/html/changelogs/AutoChangeLog-pr-10144.yml
@@ -0,0 +1,4 @@
+author: "Linzolle"
+delete-after: True
+changes:
+ - bugfix: "officer's sabre now properly makes the unsheating and resheating noise"
diff --git a/html/changelogs/AutoChangeLog-pr-10150.yml b/html/changelogs/AutoChangeLog-pr-10150.yml
new file mode 100644
index 0000000000..d2a2b79ff0
--- /dev/null
+++ b/html/changelogs/AutoChangeLog-pr-10150.yml
@@ -0,0 +1,4 @@
+author: "Trilbyspaceclone"
+delete-after: True
+changes:
+ - bugfix: "Wrong icon names, missing dog fashion with telegram hat"
diff --git a/html/changelogs/AutoChangeLog-pr-10153.yml b/html/changelogs/AutoChangeLog-pr-10153.yml
new file mode 100644
index 0000000000..7196583de9
--- /dev/null
+++ b/html/changelogs/AutoChangeLog-pr-10153.yml
@@ -0,0 +1,4 @@
+author: "Linzolle"
+delete-after: True
+changes:
+ - bugfix: "fireman failure has a different message depending on the circumstance"
diff --git a/html/changelogs/AutoChangeLog-pr-9744.yml b/html/changelogs/AutoChangeLog-pr-10155.yml
similarity index 51%
rename from html/changelogs/AutoChangeLog-pr-9744.yml
rename to html/changelogs/AutoChangeLog-pr-10155.yml
index a653e77c1a..d82ea5ed43 100644
--- a/html/changelogs/AutoChangeLog-pr-9744.yml
+++ b/html/changelogs/AutoChangeLog-pr-10155.yml
@@ -1,4 +1,4 @@
author: "Seris02"
delete-after: True
changes:
- - bugfix: "fixed the meteor hallucination"
+ - bugfix: "distance checks"
diff --git a/html/changelogs/AutoChangeLog-pr-10156.yml b/html/changelogs/AutoChangeLog-pr-10156.yml
new file mode 100644
index 0000000000..ec08642b3f
--- /dev/null
+++ b/html/changelogs/AutoChangeLog-pr-10156.yml
@@ -0,0 +1,5 @@
+author: "Ghommie"
+delete-after: True
+changes:
+ - bugfix: "Fixed character setup preview bodyparts not displaying correctly most of times."
+ - bugfix: "Fixed character appearance preview displaying the mannequin in job attire instead of undergarments."
diff --git a/html/changelogs/AutoChangeLog-pr-10157.yml b/html/changelogs/AutoChangeLog-pr-10157.yml
new file mode 100644
index 0000000000..6ec495b7fc
--- /dev/null
+++ b/html/changelogs/AutoChangeLog-pr-10157.yml
@@ -0,0 +1,5 @@
+author: "ShizCalev"
+delete-after: True
+changes:
+ - bugfix: "Fixed floodlights not turning off properly when they're underpowered."
+ - bugfix: "Fixed emitters not changing icons properly when they're underpowered."
diff --git a/html/changelogs/AutoChangeLog-pr-10160.yml b/html/changelogs/AutoChangeLog-pr-10160.yml
new file mode 100644
index 0000000000..2046324dc8
--- /dev/null
+++ b/html/changelogs/AutoChangeLog-pr-10160.yml
@@ -0,0 +1,6 @@
+author: "nicbn, Kevinz000, ShizCalev"
+delete-after: True
+changes:
+ - tweak: "Fire alarm is now simpler. Touch it to activate, touch it to deactivate. When activated, it will blink inconsistently if it is emagged."
+ - bugfix: "You can no longer spam fire alarms. Also, they're logged again."
+ - bugfix: "Fixed fire alarms not updating icons properly after being emagged and hacked by Malf AI's."
diff --git a/html/changelogs/AutoChangeLog-pr-10161.yml b/html/changelogs/AutoChangeLog-pr-10161.yml
new file mode 100644
index 0000000000..7f09609b99
--- /dev/null
+++ b/html/changelogs/AutoChangeLog-pr-10161.yml
@@ -0,0 +1,4 @@
+author: "Ghommie"
+delete-after: True
+changes:
+ - bugfix: "Fixed raven's shuttle computer not being of the emergency shuttle type."
diff --git a/html/changelogs/AutoChangeLog-pr-10163.yml b/html/changelogs/AutoChangeLog-pr-10163.yml
new file mode 100644
index 0000000000..2818019ad7
--- /dev/null
+++ b/html/changelogs/AutoChangeLog-pr-10163.yml
@@ -0,0 +1,4 @@
+author: "Ghommie"
+delete-after: True
+changes:
+ - tweak: "Blood bank generators can now be anchored and unanchored now."
diff --git a/html/changelogs/AutoChangeLog-pr-10164.yml b/html/changelogs/AutoChangeLog-pr-10164.yml
new file mode 100644
index 0000000000..464edda73b
--- /dev/null
+++ b/html/changelogs/AutoChangeLog-pr-10164.yml
@@ -0,0 +1,4 @@
+author: "kappa-sama"
+delete-after: True
+changes:
+ - rscadd: "martial apprentices for the local Chinese wizard"
diff --git a/html/changelogs/AutoChangeLog-pr-10166.yml b/html/changelogs/AutoChangeLog-pr-10166.yml
new file mode 100644
index 0000000000..ba919010af
--- /dev/null
+++ b/html/changelogs/AutoChangeLog-pr-10166.yml
@@ -0,0 +1,4 @@
+author: "nemvar"
+delete-after: True
+changes:
+ - bugfix: "The brains of roundstart borgs no longer decay."
diff --git a/html/changelogs/AutoChangeLog-pr-10171.yml b/html/changelogs/AutoChangeLog-pr-10171.yml
new file mode 100644
index 0000000000..0138d7a381
--- /dev/null
+++ b/html/changelogs/AutoChangeLog-pr-10171.yml
@@ -0,0 +1,4 @@
+author: "r4d6"
+delete-after: True
+changes:
+ - rscdel: "Removed a AM Shielding from the crate"
diff --git a/html/changelogs/AutoChangeLog-pr-10172.yml b/html/changelogs/AutoChangeLog-pr-10172.yml
new file mode 100644
index 0000000000..ce76e04d13
--- /dev/null
+++ b/html/changelogs/AutoChangeLog-pr-10172.yml
@@ -0,0 +1,11 @@
+author: "Mickyan, nemvar, RaveRadbury, AnturK, SpaceManiac"
+delete-after: True
+changes:
+ - bugfix: "Certain incompatible quirks can no longer be taken together."
+ - bugfix: "If an admin sends a ghost back to the lobby, they can now choose a different set of quirks."
+ - spellcheck: "the quirk menu went through some minor formatting changes."
+ - bugfix: "Podcloning now lets you keep your quirks."
+ - rscadd: "Quirks have flavor text in medical records."
+ - spellcheck: "All quirk medical records refer to \"Patient\", removing a few instances of \"Subject\"."
+ - tweak: "Quirks no longer apply to off-station roundstart antagonists."
+ - code_imp: "Mood quirks are now only processed by the quirk holders"
diff --git a/html/changelogs/AutoChangeLog-pr-10180.yml b/html/changelogs/AutoChangeLog-pr-10180.yml
new file mode 100644
index 0000000000..0a22910940
--- /dev/null
+++ b/html/changelogs/AutoChangeLog-pr-10180.yml
@@ -0,0 +1,5 @@
+author: "Ghommie"
+delete-after: True
+changes:
+ - bugfix: "Fixes a ghostchat eavesdropping exploit concerning VR."
+ - bugfix: "Fixes VR deaths being broadcasted in deadchat."
diff --git a/html/changelogs/AutoChangeLog-pr-10181.yml b/html/changelogs/AutoChangeLog-pr-10181.yml
new file mode 100644
index 0000000000..bb00ab1012
--- /dev/null
+++ b/html/changelogs/AutoChangeLog-pr-10181.yml
@@ -0,0 +1,4 @@
+author: "Ghommie"
+delete-after: True
+changes:
+ - bugfix: "Fixed a few pill bottle issues with the ChemMaster."
diff --git a/html/changelogs/AutoChangeLog-pr-10190.yml b/html/changelogs/AutoChangeLog-pr-10190.yml
new file mode 100644
index 0000000000..d05ad85db3
--- /dev/null
+++ b/html/changelogs/AutoChangeLog-pr-10190.yml
@@ -0,0 +1,5 @@
+author: "Trilbyspaceclone"
+delete-after: True
+changes:
+ - rscadd: "New softdrink that comes in its own vender!"
+ - rscadd: "Honey now has a reaction with plants"
diff --git a/html/changelogs/AutoChangeLog-pr-10193.yml b/html/changelogs/AutoChangeLog-pr-10193.yml
new file mode 100644
index 0000000000..b432eb74a3
--- /dev/null
+++ b/html/changelogs/AutoChangeLog-pr-10193.yml
@@ -0,0 +1,4 @@
+author: "Commandersand"
+delete-after: True
+changes:
+ - tweak: "added two words to clown filter"
diff --git a/html/changelogs/AutoChangeLog-pr-10195.yml b/html/changelogs/AutoChangeLog-pr-10195.yml
new file mode 100644
index 0000000000..be8ed0ce76
--- /dev/null
+++ b/html/changelogs/AutoChangeLog-pr-10195.yml
@@ -0,0 +1,5 @@
+author: "Ghommie"
+delete-after: True
+changes:
+ - bugfix: "Fixes a few negative quirks not being properly removed when deleted."
+ - tweak: "Phobia and mute quirks are no longer cheesed by brain surgery grade healing or medicines."
diff --git a/html/changelogs/AutoChangeLog-pr-10197.yml b/html/changelogs/AutoChangeLog-pr-10197.yml
new file mode 100644
index 0000000000..05545c066c
--- /dev/null
+++ b/html/changelogs/AutoChangeLog-pr-10197.yml
@@ -0,0 +1,4 @@
+author: "Ghommie"
+delete-after: True
+changes:
+ - bugfix: "Fixed double-flavour (and bland custom) ice creams."
diff --git a/html/changelogs/AutoChangeLog-pr-10198.yml b/html/changelogs/AutoChangeLog-pr-10198.yml
new file mode 100644
index 0000000000..3414258d84
--- /dev/null
+++ b/html/changelogs/AutoChangeLog-pr-10198.yml
@@ -0,0 +1,4 @@
+author: "AnturK"
+delete-after: True
+changes:
+ - bugfix: "Fixed ranged syndicate mobs stormtrooper training."
diff --git a/html/changelogs/AutoChangeLog-pr-10200.yml b/html/changelogs/AutoChangeLog-pr-10200.yml
new file mode 100644
index 0000000000..8d4782ee98
--- /dev/null
+++ b/html/changelogs/AutoChangeLog-pr-10200.yml
@@ -0,0 +1,4 @@
+author: "kevinz000"
+delete-after: True
+changes:
+ - rscadd: "added 8 character save slots"
diff --git a/html/changelogs/AutoChangeLog-pr-10203.yml b/html/changelogs/AutoChangeLog-pr-10203.yml
new file mode 100644
index 0000000000..7cb4df817b
--- /dev/null
+++ b/html/changelogs/AutoChangeLog-pr-10203.yml
@@ -0,0 +1,5 @@
+author: "DeltaFire15"
+delete-after: True
+changes:
+ - tweak: "changed mecha internals access for some special mechs."
+ - tweak: "no more mech maintenance access for engineers."
diff --git a/html/changelogs/AutoChangeLog-pr-10204.yml b/html/changelogs/AutoChangeLog-pr-10204.yml
new file mode 100644
index 0000000000..ad5a872bc0
--- /dev/null
+++ b/html/changelogs/AutoChangeLog-pr-10204.yml
@@ -0,0 +1,5 @@
+author: "r4d6"
+delete-after: True
+changes:
+ - rscadd: "Added Handshakes"
+ - rscadd: "Added Nose booping"
diff --git a/html/changelogs/AutoChangeLog-pr-10207.yml b/html/changelogs/AutoChangeLog-pr-10207.yml
new file mode 100644
index 0000000000..c451475dfa
--- /dev/null
+++ b/html/changelogs/AutoChangeLog-pr-10207.yml
@@ -0,0 +1,4 @@
+author: "Ghommie"
+delete-after: True
+changes:
+ - bugfix: "Fixed Pubbystation's wall Nanomeds being inconsistent with other stations'."
diff --git a/html/changelogs/AutoChangeLog-pr-10210.yml b/html/changelogs/AutoChangeLog-pr-10210.yml
new file mode 100644
index 0000000000..39167dee25
--- /dev/null
+++ b/html/changelogs/AutoChangeLog-pr-10210.yml
@@ -0,0 +1,4 @@
+author: "kevinz000"
+delete-after: True
+changes:
+ - rscadd: "Cargo shuttle now silently ignores slaughter demons/revenants instead of being blocked even while they are jaunted. A drawback is that manifested ones can't block it either, any more."
diff --git a/html/changelogs/AutoChangeLog-pr-10214.yml b/html/changelogs/AutoChangeLog-pr-10214.yml
new file mode 100644
index 0000000000..fe5df9f22c
--- /dev/null
+++ b/html/changelogs/AutoChangeLog-pr-10214.yml
@@ -0,0 +1,4 @@
+author: "Ghommie"
+delete-after: True
+changes:
+ - bugfix: "dextrous simplemobs can now swap action intent with 1, 2, 3, 4 now. Just like humies, ayys and monkys."
diff --git a/html/changelogs/AutoChangeLog-pr-10216.yml b/html/changelogs/AutoChangeLog-pr-10216.yml
new file mode 100644
index 0000000000..69daa62448
--- /dev/null
+++ b/html/changelogs/AutoChangeLog-pr-10216.yml
@@ -0,0 +1,8 @@
+author: "Nervere and subject217, Militaires, py01, nemvar"
+delete-after: True
+changes:
+ - balance: "The cook's CQC now only works when in the kitchen or the kitchen backroom."
+ - spellcheck: "corrected CQC help instructions"
+ - bugfix: "CQC and Sleeping Carp are properly logged."
+ - tweak: "CQC can passively grab targets when not on grab intent. Passive grabs do not count towards combos for CQC or Sleeping carp."
+ - code_imp: "Martial Art and NOGUN cleanup."
diff --git a/html/changelogs/AutoChangeLog-pr-9964.yml b/html/changelogs/AutoChangeLog-pr-10218.yml
similarity index 61%
rename from html/changelogs/AutoChangeLog-pr-9964.yml
rename to html/changelogs/AutoChangeLog-pr-10218.yml
index 76687969ca..fb05465cbe 100644
--- a/html/changelogs/AutoChangeLog-pr-9964.yml
+++ b/html/changelogs/AutoChangeLog-pr-10218.yml
@@ -1,4 +1,4 @@
author: "GrayRachnid"
delete-after: True
changes:
- - bugfix: "fixed my mistakes"
+ - bugfix: "fixes consistency"
diff --git a/html/changelogs/AutoChangeLog-pr-10225.yml b/html/changelogs/AutoChangeLog-pr-10225.yml
new file mode 100644
index 0000000000..964cc68223
--- /dev/null
+++ b/html/changelogs/AutoChangeLog-pr-10225.yml
@@ -0,0 +1,5 @@
+author: "BlueWildrose"
+delete-after: True
+changes:
+ - bugfix: "Fixed stargazers being unable to link to themselves if mindshielded or if holding psionic shielding devices (tinfoil hats) when the species is set."
+ - bugfix: "Fixes non-roundstart slimes being unable to wag their tail."
diff --git a/html/changelogs/AutoChangeLog-pr-10015.yml b/html/changelogs/AutoChangeLog-pr-10227.yml
similarity index 59%
rename from html/changelogs/AutoChangeLog-pr-10015.yml
rename to html/changelogs/AutoChangeLog-pr-10227.yml
index 61ce93cd88..5d9446d045 100644
--- a/html/changelogs/AutoChangeLog-pr-10015.yml
+++ b/html/changelogs/AutoChangeLog-pr-10227.yml
@@ -1,4 +1,4 @@
author: "Putnam3145"
delete-after: True
changes:
- - bugfix: "traitors work now"
+ - bugfix: "whoops broke quirks"
diff --git a/html/changelogs/AutoChangeLog-pr-9831.yml b/html/changelogs/AutoChangeLog-pr-10228.yml
similarity index 62%
rename from html/changelogs/AutoChangeLog-pr-9831.yml
rename to html/changelogs/AutoChangeLog-pr-10228.yml
index 569fd14f69..ccc386bbcb 100644
--- a/html/changelogs/AutoChangeLog-pr-9831.yml
+++ b/html/changelogs/AutoChangeLog-pr-10228.yml
@@ -1,4 +1,4 @@
author: "Putnam3145"
delete-after: True
changes:
- - tweak: "tweaked nuke ops"
+ - bugfix: "quirks work"
diff --git a/html/changelogs/AutoChangeLog-pr-10231.yml b/html/changelogs/AutoChangeLog-pr-10231.yml
new file mode 100644
index 0000000000..7caf65b09f
--- /dev/null
+++ b/html/changelogs/AutoChangeLog-pr-10231.yml
@@ -0,0 +1,4 @@
+author: "Seris02"
+delete-after: True
+changes:
+ - bugfix: "the sprites"
diff --git a/html/changelogs/AutoChangeLog-pr-10232.yml b/html/changelogs/AutoChangeLog-pr-10232.yml
new file mode 100644
index 0000000000..479012a868
--- /dev/null
+++ b/html/changelogs/AutoChangeLog-pr-10232.yml
@@ -0,0 +1,4 @@
+author: "DeltaFire15"
+delete-after: True
+changes:
+ - tweak: "All heads of staff can now message CC"
diff --git a/html/changelogs/AutoChangeLog-pr-10235.yml b/html/changelogs/AutoChangeLog-pr-10235.yml
new file mode 100644
index 0000000000..ca8e4da164
--- /dev/null
+++ b/html/changelogs/AutoChangeLog-pr-10235.yml
@@ -0,0 +1,4 @@
+author: "kevinz000"
+delete-after: True
+changes:
+ - balance: "flashbangs process light/sound separately and uses viewers(), so xray users beware."
diff --git a/html/changelogs/AutoChangeLog-pr-10237.yml b/html/changelogs/AutoChangeLog-pr-10237.yml
new file mode 100644
index 0000000000..0a3b481d8c
--- /dev/null
+++ b/html/changelogs/AutoChangeLog-pr-10237.yml
@@ -0,0 +1,4 @@
+author: "Ghommie"
+delete-after: True
+changes:
+ - bugfix: "Stops humanoids whose skin_tone variable is set to \"albino\" from showing up as pale when examined should their species not use skintones anyway."
diff --git a/html/changelogs/AutoChangeLog-pr-10242.yml b/html/changelogs/AutoChangeLog-pr-10242.yml
new file mode 100644
index 0000000000..017c3f99bd
--- /dev/null
+++ b/html/changelogs/AutoChangeLog-pr-10242.yml
@@ -0,0 +1,4 @@
+author: "nemvar"
+delete-after: True
+changes:
+ - code_imp: "Refactored the visibility of reagents for mobs."
diff --git a/html/changelogs/AutoChangeLog-pr-10245.yml b/html/changelogs/AutoChangeLog-pr-10245.yml
new file mode 100644
index 0000000000..a618bfc76b
--- /dev/null
+++ b/html/changelogs/AutoChangeLog-pr-10245.yml
@@ -0,0 +1,5 @@
+author: "r4d6"
+delete-after: True
+changes:
+ - rscadd: "Added submaps for the SM, Tesla and Singulo"
+ - rscadd: "Added a placeholder on Boxstation for the Engines"
diff --git a/html/changelogs/AutoChangeLog-pr-10246.yml b/html/changelogs/AutoChangeLog-pr-10246.yml
new file mode 100644
index 0000000000..73b2b24ee8
--- /dev/null
+++ b/html/changelogs/AutoChangeLog-pr-10246.yml
@@ -0,0 +1,4 @@
+author: "kevinz000"
+delete-after: True
+changes:
+ - tweak: "Stat() slowed down for anti-lag measures."
diff --git a/html/changelogs/AutoChangeLog-pr-10250.yml b/html/changelogs/AutoChangeLog-pr-10250.yml
new file mode 100644
index 0000000000..8e32083f09
--- /dev/null
+++ b/html/changelogs/AutoChangeLog-pr-10250.yml
@@ -0,0 +1,4 @@
+author: "Toriate"
+delete-after: True
+changes:
+ - rscadd: "Polychromic shorts now have a digitigrade state"
diff --git a/html/changelogs/AutoChangeLog-pr-10254.yml b/html/changelogs/AutoChangeLog-pr-10254.yml
new file mode 100644
index 0000000000..59fefc5703
--- /dev/null
+++ b/html/changelogs/AutoChangeLog-pr-10254.yml
@@ -0,0 +1,4 @@
+author: "r4d6"
+delete-after: True
+changes:
+ - bugfix: "fixed Nose boops not triggering"
diff --git a/html/changelogs/AutoChangeLog-pr-10257.yml b/html/changelogs/AutoChangeLog-pr-10257.yml
new file mode 100644
index 0000000000..d18807c1eb
--- /dev/null
+++ b/html/changelogs/AutoChangeLog-pr-10257.yml
@@ -0,0 +1,4 @@
+author: "DeltaFire15"
+delete-after: True
+changes:
+ - code_imp: "Removes a magicnumber"
diff --git a/html/changelogs/AutoChangeLog-pr-10263.yml b/html/changelogs/AutoChangeLog-pr-10263.yml
new file mode 100644
index 0000000000..a8fa2b9e26
--- /dev/null
+++ b/html/changelogs/AutoChangeLog-pr-10263.yml
@@ -0,0 +1,4 @@
+author: "Trilbyspaceclone"
+delete-after: True
+changes:
+ - tweak: "Buzz fuzz now only has a 5% to give honey and will now give 1u of sugar not 2"
diff --git a/html/changelogs/AutoChangeLog-pr-10266.yml b/html/changelogs/AutoChangeLog-pr-10266.yml
new file mode 100644
index 0000000000..7fc7f11682
--- /dev/null
+++ b/html/changelogs/AutoChangeLog-pr-10266.yml
@@ -0,0 +1,5 @@
+author: "shellspeed1"
+delete-after: True
+changes:
+ - rscadd: "Adds Insect markings"
+ - rscadd: "Adds three new moth wings."
diff --git a/html/changelogs/AutoChangeLog-pr-9723.yml b/html/changelogs/AutoChangeLog-pr-10269.yml
similarity index 57%
rename from html/changelogs/AutoChangeLog-pr-9723.yml
rename to html/changelogs/AutoChangeLog-pr-10269.yml
index 2952fc8273..f38bb346e3 100644
--- a/html/changelogs/AutoChangeLog-pr-9723.yml
+++ b/html/changelogs/AutoChangeLog-pr-10269.yml
@@ -1,4 +1,4 @@
author: "Ghommie"
delete-after: True
changes:
- - bugfix: "Riding component fix"
+ - bugfix: "Fixed goose meat."
diff --git a/html/changelogs/AutoChangeLog-pr-10274.yml b/html/changelogs/AutoChangeLog-pr-10274.yml
new file mode 100644
index 0000000000..a1b448344f
--- /dev/null
+++ b/html/changelogs/AutoChangeLog-pr-10274.yml
@@ -0,0 +1,4 @@
+author: "kappa-sama"
+delete-after: True
+changes:
+ - bugfix: "broodmother baby lag"
diff --git a/html/changelogs/AutoChangeLog-pr-10281.yml b/html/changelogs/AutoChangeLog-pr-10281.yml
new file mode 100644
index 0000000000..0d6c353703
--- /dev/null
+++ b/html/changelogs/AutoChangeLog-pr-10281.yml
@@ -0,0 +1,5 @@
+author: "Hatterhat"
+delete-after: True
+changes:
+ - rscadd: ".357 speedloaders can now be printed with the Advanced Illegal Ballistics node on the tech tree!"
+ - balance: "okay so i may have given the .357 an extra speedloader at the same cost but it comes in a box now"
diff --git a/html/changelogs/AutoChangeLog-pr-10039.yml b/html/changelogs/AutoChangeLog-pr-10282.yml
similarity index 50%
rename from html/changelogs/AutoChangeLog-pr-10039.yml
rename to html/changelogs/AutoChangeLog-pr-10282.yml
index 9bc5eaf62b..bf4f74c84a 100644
--- a/html/changelogs/AutoChangeLog-pr-10039.yml
+++ b/html/changelogs/AutoChangeLog-pr-10282.yml
@@ -1,4 +1,4 @@
author: "Putnam3145"
delete-after: True
changes:
- - bugfix: "traitor removal is no longer borked"
+ - config: "Buncha dynamic config tweaks"
diff --git a/html/changelogs/AutoChangeLog-pr-10283.yml b/html/changelogs/AutoChangeLog-pr-10283.yml
new file mode 100644
index 0000000000..435a0c7ca9
--- /dev/null
+++ b/html/changelogs/AutoChangeLog-pr-10283.yml
@@ -0,0 +1,4 @@
+author: "Detective-Google"
+delete-after: True
+changes:
+ - bugfix: "short hair 80's is no longer jank"
diff --git a/html/changelogs/AutoChangeLog-pr-9268.yml b/html/changelogs/AutoChangeLog-pr-9268.yml
deleted file mode 100644
index 3d856b6842..0000000000
--- a/html/changelogs/AutoChangeLog-pr-9268.yml
+++ /dev/null
@@ -1,5 +0,0 @@
-author: "Fermis"
-delete-after: True
-changes:
- - tweak: "Purity, Astral, RNG, MK, SMilk, SDGF, furranium, hatmium, eigen, nanite."
- - bugfix: "Eigen and purity."
diff --git a/html/changelogs/AutoChangeLog-pr-9323.yml b/html/changelogs/AutoChangeLog-pr-9323.yml
deleted file mode 100644
index 19e91deaf5..0000000000
--- a/html/changelogs/AutoChangeLog-pr-9323.yml
+++ /dev/null
@@ -1,4 +0,0 @@
-author: "kevinz000"
-delete-after: True
-changes:
- - rscadd: "you can now choose never for this round for magical antags"
diff --git a/html/changelogs/AutoChangeLog-pr-9372.yml b/html/changelogs/AutoChangeLog-pr-9372.yml
deleted file mode 100644
index 923200ce11..0000000000
--- a/html/changelogs/AutoChangeLog-pr-9372.yml
+++ /dev/null
@@ -1,13 +0,0 @@
-author: "Weblure"
-delete-after: True
-changes:
- - rscadd: "Button added to slime console that prints out the hotkey commands to the user. [Includes DMI update]"
- - rscadd: "Shift-click a slime to pick it up, or the floor to drop all held slimes. (Requires Basic Slime Console upgrade)"
- - rscadd: "Ctrl-click a slime to scan it."
- - rscadd: "Alt-click a slime to feed it a potion. (Requires Advanced Slime Console upgrade)"
- - rscadd: "Ctrl-click on a dead monkey to recycle it, or the floor to place a new monkey. (Requires Monkey Console upgrade)"
- - rscadd: "If the console does not have the required upgrade, an error message will print to the user."
- - rscadd: "You can now pick up a single slime from a pile, instead of all of them at once."
- - tweak: "When recycling monkeys, the console will now report how many monkeys it has (will not report decimal increases)."
- - tweak: "Console now alerts you when you're out of monkeys and reports your current decimal amount."
- - tweak: "Console messages are now styled consistently."
diff --git a/html/changelogs/AutoChangeLog-pr-9430.yml b/html/changelogs/AutoChangeLog-pr-9430.yml
deleted file mode 100644
index 8552d00926..0000000000
--- a/html/changelogs/AutoChangeLog-pr-9430.yml
+++ /dev/null
@@ -1,8 +0,0 @@
-author: "Ghommie (original PR by Denton)"
-delete-after: True
-changes:
- - rscadd: "Added three new .38 ammo types. TRAC bullets, which embed a tracking implant inside the target's body. The implant only lasts for five minutes and doesn't work as a teleport beacon. Hot Shot bullets set targets on fire; Iceblox bullets drastically lower the target's body temperature. They are available after researching the Subdermal Implants node (TRAC) or Exotic Ammunition node (Hot Shot/Iceblox)."
- - tweak: "Renamed the Technological Shells research node to Exotic Ammunition."
- - code_imp: "The \"lifespan_postmortem\" var now determines how long tracking implants work after death."
- - rscadd: ".357 AP speedloaders can now be ordered from syndicate uplinks."
- - balance: "lowered the cost of uplink's .357 speedloaderd from 4 to 3."
diff --git a/html/changelogs/AutoChangeLog-pr-9453.yml b/html/changelogs/AutoChangeLog-pr-9453.yml
deleted file mode 100644
index bcb35f7394..0000000000
--- a/html/changelogs/AutoChangeLog-pr-9453.yml
+++ /dev/null
@@ -1,5 +0,0 @@
-author: "Ghommie"
-delete-after: True
-changes:
- - tweak: "Suicide and cryo now prevents ghost/midround roles for a definite duration of 30 minutes (and more if that was done before 30 minutes in the game passed), down from the rest of the round."
- - bugfix: "fixed several midround roles bypassing and nulling the aforementioned prevention measures."
diff --git a/html/changelogs/AutoChangeLog-pr-9518.yml b/html/changelogs/AutoChangeLog-pr-9518.yml
deleted file mode 100644
index 67a2c25938..0000000000
--- a/html/changelogs/AutoChangeLog-pr-9518.yml
+++ /dev/null
@@ -1,4 +0,0 @@
-author: "Ghommie (original PR by nicbn and Menshin)"
-delete-after: True
-changes:
- - bugfix: "You can click on things that are under flaps or holo barriers."
diff --git a/html/changelogs/AutoChangeLog-pr-9530.yml b/html/changelogs/AutoChangeLog-pr-9530.yml
deleted file mode 100644
index ace41e9e97..0000000000
--- a/html/changelogs/AutoChangeLog-pr-9530.yml
+++ /dev/null
@@ -1,5 +0,0 @@
-author: "Ghommie"
-delete-after: True
-changes:
- - bugfix: "Fixed the little issue of PDA skins not updating on job equip."
- - tweak: "Anomaly Crystals of the clowning type will now rename the victim to their clown name preference when triggered, instead of giving them a random clown name."
diff --git a/html/changelogs/AutoChangeLog-pr-9538.yml b/html/changelogs/AutoChangeLog-pr-9538.yml
new file mode 100644
index 0000000000..a036a8d24a
--- /dev/null
+++ b/html/changelogs/AutoChangeLog-pr-9538.yml
@@ -0,0 +1,5 @@
+author: "kevinz000"
+delete-after: True
+changes:
+ - balance: "Combat defibs now instant stun on disarm rather than 1 second again"
+ - balance: "Defibs are now always emagged when emagged with an emag rather than EMP."
diff --git a/html/changelogs/AutoChangeLog-pr-9544.yml b/html/changelogs/AutoChangeLog-pr-9544.yml
deleted file mode 100644
index 1b0d979b7f..0000000000
--- a/html/changelogs/AutoChangeLog-pr-9544.yml
+++ /dev/null
@@ -1,4 +0,0 @@
-author: "MrJWhit"
-delete-after: True
-changes:
- - tweak: "tweaked brain damage line"
diff --git a/html/changelogs/AutoChangeLog-pr-9554.yml b/html/changelogs/AutoChangeLog-pr-9554.yml
deleted file mode 100644
index 229f5a5d0c..0000000000
--- a/html/changelogs/AutoChangeLog-pr-9554.yml
+++ /dev/null
@@ -1,4 +0,0 @@
-author: "Anonymous"
-delete-after: True
-changes:
- - rscadd: "Added NEET-- I mean, DAB Suit and Helmet into loadout. Exclusive to Assistants, for obvious reasons, and don't provide any armor. Goes well with balaclava, finger-less gloves and jackboots for that true tactic~~f~~ool experience."
diff --git a/html/changelogs/AutoChangeLog-pr-9557.yml b/html/changelogs/AutoChangeLog-pr-9557.yml
deleted file mode 100644
index f88e9cced8..0000000000
--- a/html/changelogs/AutoChangeLog-pr-9557.yml
+++ /dev/null
@@ -1,5 +0,0 @@
-author: "Putnam3145"
-delete-after: True
-changes:
- - rscadd: "Dynamic voting"
- - config: "Added DYNAMIC_VOTING to game_options"
diff --git a/html/changelogs/AutoChangeLog-pr-9563.yml b/html/changelogs/AutoChangeLog-pr-9563.yml
new file mode 100644
index 0000000000..47fab1530d
--- /dev/null
+++ b/html/changelogs/AutoChangeLog-pr-9563.yml
@@ -0,0 +1,4 @@
+author: "Fermis"
+delete-after: True
+changes:
+ - tweak: "tweaked how super bases/acids work but limiting them"
diff --git a/html/changelogs/AutoChangeLog-pr-9574.yml b/html/changelogs/AutoChangeLog-pr-9574.yml
deleted file mode 100644
index 240d5ad0af..0000000000
--- a/html/changelogs/AutoChangeLog-pr-9574.yml
+++ /dev/null
@@ -1,4 +0,0 @@
-author: "r4d6"
-delete-after: True
-changes:
- - rscadd: "Added Departements Winter Coats to the loadout list."
diff --git a/html/changelogs/AutoChangeLog-pr-9575.yml b/html/changelogs/AutoChangeLog-pr-9575.yml
deleted file mode 100644
index 76b71da82b..0000000000
--- a/html/changelogs/AutoChangeLog-pr-9575.yml
+++ /dev/null
@@ -1,24 +0,0 @@
-author: "KathrinBailey"
-delete-after: True
-changes:
- - rscadd: "Two extra 'luxury' dorms rooms!"
- - rscadd: "Gas miners to atmos."
- - rscadd: "Posters around the station."
- - rscadd: "Vacant room added to the Starboard Bow with it's own APC, above electrical maintenance."
- - rscadd: "New trendy clothes to the locker room, giving variety and bringing fashion back onto Nanotrasen stations."
- - rscadd: "Coloured bedsheet and towel bin."
- - rscadd: "Maid uniforms for the janitor."
- - tweak: "Completely reworked bar. Milk kegs added in bar office. The bar has been changed for a homey restaurant feel just in time for Christmas! You can now run it as an actual restaurant! Local Bartender Icktsie III loved it so much he rolled around on the new floor smiling happily."
- - tweak: "Dorms rework. Fitness room now has lots of costumes and outfits."
- - tweak: "Junk removed from engineering, welding goggles added."
- - tweak: "Welding tools in engineering replaced with industrial welding tools."
- - tweak: "Package wrappers and hand labellers now in major departments."
- - tweak: "Cell charger moved from engineering lobby to the protolathe room, just like how it is in all of the other maps and just where the cell charger is actually needed."
- - tweak: "Library redesigned to have a private room and a 3x3 private study that is cleaned up."
- - tweak: "Paper bins have gone big or gone home, with premium stationery scattered around. Engineering and security now have a labeller and packaging supplies."
- - bugfix: "Dark spot top left of Botany fixed."
- - bugfix: "Huge galactic-sized dark spot in bar fixed."
- - bugfix: "Light replacers now are less horrifically overpowered and PTSD-inducing for the server."
- - bugfix: "Fixes issue 9706: https://github.com/Citadel-Station-13/Citadel-Station-13/issues/9706 Part of maint getting hit by radstorms.
-
-_Kathrin's Box Beautification:_"
diff --git a/html/changelogs/AutoChangeLog-pr-9596.yml b/html/changelogs/AutoChangeLog-pr-9596.yml
new file mode 100644
index 0000000000..3f924b85ab
--- /dev/null
+++ b/html/changelogs/AutoChangeLog-pr-9596.yml
@@ -0,0 +1,11 @@
+author: "Linzolle"
+delete-after: True
+changes:
+ - rscadd: "Abductor chem dispenser, and added it to the abductor console."
+ - rscadd: "\"Superlingual matrix\" to the abductor console. It's the abductor's tongue. Can be used to link it to your abductor communication channel and then implanted into a test subject."
+ - rscadd: "Shrink ray and added it to the abductor console."
+ - soundadd: "Shrink ray sound effect (its the fucking mega man death sound)"
+ - rscadd: "special jumpsuit for abductors"
+ - imageadd: "abductor jumpsuit, including digi version if a digitigrade person somehow manages to get their hands on it. sprites for the shrink ray and chem dispenser."
+ - rscadd: "new glands to play with, including the all-access gland, the quantum gland, and the blood type randomiser."
+ - code_imp: "split every gland into its own file instead of all being in one file"
diff --git a/html/changelogs/AutoChangeLog-pr-9611.yml b/html/changelogs/AutoChangeLog-pr-9611.yml
deleted file mode 100644
index 48a0e9982b..0000000000
--- a/html/changelogs/AutoChangeLog-pr-9611.yml
+++ /dev/null
@@ -1,6 +0,0 @@
-author: "kevinz000"
-delete-after: True
-changes:
- - rscadd: "Cargo has passive point generation again at 750 points/minute"
- - balance: "Mindshield crate price increased from 3000 to 4000"
- - balance: "Miasma sell price reduced from 15/mol to 4/mol"
diff --git a/html/changelogs/AutoChangeLog-pr-9628.yml b/html/changelogs/AutoChangeLog-pr-9628.yml
deleted file mode 100644
index 45315940ac..0000000000
--- a/html/changelogs/AutoChangeLog-pr-9628.yml
+++ /dev/null
@@ -1,9 +0,0 @@
-author: "Trilbyspaceclone"
-delete-after: True
-changes:
- - rscadd: "six more crates, A barrel, A Loom, 40 cotton sheets, two sets of fruit crates, raw lumber crate"
- - rscadd: "All fermi chems, Boozes, Medical, food chems now sell"
- - rscadd: "Loads more to sell - Mech gear, Cooking and more!"
- - tweak: "Moved around the vaule of some things and removed elastic of most items"
- - balance: "Rebreather implants will now loss vaule, Do to being just metal and glass"
- - balance: "lowered how many chems are in lewd chem kegs to be around 150-100 as well as the fancy booze kegs"
diff --git a/html/changelogs/AutoChangeLog-pr-9629.yml b/html/changelogs/AutoChangeLog-pr-9629.yml
new file mode 100644
index 0000000000..f0419e4ce9
--- /dev/null
+++ b/html/changelogs/AutoChangeLog-pr-9629.yml
@@ -0,0 +1,4 @@
+author: "kevinz000"
+delete-after: True
+changes:
+ - bugfix: "aooc toggling now only broadcasts to antagonists"
diff --git a/html/changelogs/AutoChangeLog-pr-9632.yml b/html/changelogs/AutoChangeLog-pr-9632.yml
deleted file mode 100644
index 41abee528f..0000000000
--- a/html/changelogs/AutoChangeLog-pr-9632.yml
+++ /dev/null
@@ -1,5 +0,0 @@
-author: "Kevinz000, Cruix, MrStonedOne, Denton, Kmc2000, Anturk, MrDoomBringer, Dennok, TheChosenEvilOne, Ghommie"
-delete-after: True
-changes:
- - rscadd: "Added support for Multi-Z power, atmospherics and disposals"
- - bugfix: "massive service department nerf: space can no longer be extra crispy."
diff --git a/html/changelogs/AutoChangeLog-pr-9666.yml b/html/changelogs/AutoChangeLog-pr-9666.yml
deleted file mode 100644
index 9d4511b3e9..0000000000
--- a/html/changelogs/AutoChangeLog-pr-9666.yml
+++ /dev/null
@@ -1,4 +0,0 @@
-author: "Ghommie"
-delete-after: True
-changes:
- - balance: "Lowered blob event earliest start from 1 hour to 40 minutes (ergo one third), and the required player population from 40 to 35."
diff --git a/html/changelogs/AutoChangeLog-pr-9680.yml b/html/changelogs/AutoChangeLog-pr-9680.yml
deleted file mode 100644
index e2e9aa0b64..0000000000
--- a/html/changelogs/AutoChangeLog-pr-9680.yml
+++ /dev/null
@@ -1,9 +0,0 @@
-author: "Owai-Seek"
-delete-after: True
-changes:
- - rscadd: "\"silly\" bounties"
- - rscadd: "\"gardenchef\" bounties"
- - rscdel: "several bounties that require seriously good RNG to pull off."
- - tweak: "moved several chef and assistant bounties to silly and gardenchef"
- - balance: "modified several bounty point rewards"
- - server: "added new files \"silly.dm\" and \"gardenchef.dm\""
diff --git a/html/changelogs/AutoChangeLog-pr-9681.yml b/html/changelogs/AutoChangeLog-pr-9681.yml
deleted file mode 100644
index c4c289425b..0000000000
--- a/html/changelogs/AutoChangeLog-pr-9681.yml
+++ /dev/null
@@ -1,4 +0,0 @@
-author: "kevinz000"
-delete-after: True
-changes:
- - balance: "bluespace wizard apprentice now has blink instead of targeted area teleportation"
diff --git a/html/changelogs/AutoChangeLog-pr-9683.yml b/html/changelogs/AutoChangeLog-pr-9683.yml
deleted file mode 100644
index 44f6bb1759..0000000000
--- a/html/changelogs/AutoChangeLog-pr-9683.yml
+++ /dev/null
@@ -1,4 +0,0 @@
-author: "Ghommie"
-delete-after: True
-changes:
- - bugfix: "Several fixes and QoL for dullahans. They can see and hear visible and audible messages now, don't need a space helmet they can't wear anyway to be space/temperature proof, can examine things through shiftclick, and, most of all, fixed their head being unpickable. Fixed dullahans gibbing when revived or had their limbs regenerated."
diff --git a/html/changelogs/AutoChangeLog-pr-9688.yml b/html/changelogs/AutoChangeLog-pr-9688.yml
deleted file mode 100644
index 29606173a4..0000000000
--- a/html/changelogs/AutoChangeLog-pr-9688.yml
+++ /dev/null
@@ -1,5 +0,0 @@
-author: "Ghommie"
-delete-after: True
-changes:
- - bugfix: "humans should now drop gibs when gibbed again."
- - rscadd: "synths (not to be confused with IPCs), android and corporate species, as well as robotic simple mobs, will now spawn robotic giblets instead of organic ones."
diff --git a/html/changelogs/AutoChangeLog-pr-9689.yml b/html/changelogs/AutoChangeLog-pr-9689.yml
deleted file mode 100644
index e1733d92ef..0000000000
--- a/html/changelogs/AutoChangeLog-pr-9689.yml
+++ /dev/null
@@ -1,4 +0,0 @@
-author: "Ghommie"
-delete-after: True
-changes:
- - bugfix: "You can't wear dakimakuras in any other inappropriate slots save for the back slot anymore, degenerates."
diff --git a/html/changelogs/AutoChangeLog-pr-9694.yml b/html/changelogs/AutoChangeLog-pr-9694.yml
deleted file mode 100644
index 6c4842e70e..0000000000
--- a/html/changelogs/AutoChangeLog-pr-9694.yml
+++ /dev/null
@@ -1,4 +0,0 @@
-author: "him"
-delete-after: True
-changes:
- - bugfix: "hos and aeg guns now conform to le epic taser rework standards"
diff --git a/html/changelogs/AutoChangeLog-pr-9695.yml b/html/changelogs/AutoChangeLog-pr-9695.yml
deleted file mode 100644
index 60455c2bb5..0000000000
--- a/html/changelogs/AutoChangeLog-pr-9695.yml
+++ /dev/null
@@ -1,7 +0,0 @@
-author: "Ghommie (original PRs by ShizCalev, CRTXBacon and Niknakflak)"
-delete-after: True
-changes:
- - rscadd: "Adds the intelliLantern, a big ol' spooky intelliCard skin"
- - rscadd: "crafting recipe for the new intelliCard skin (requires 1 pumpkin, 1 intelliCard, 5 cables and a wirecutter as a tool)"
- - tweak: "changed the intelliTater crafting recipe to match the intelliLantern recipe (but with a potato for obvious reasons)
-add:cute pai gameboy face :3"
diff --git a/html/changelogs/AutoChangeLog-pr-9696.yml b/html/changelogs/AutoChangeLog-pr-9696.yml
deleted file mode 100644
index 3188173d54..0000000000
--- a/html/changelogs/AutoChangeLog-pr-9696.yml
+++ /dev/null
@@ -1,4 +0,0 @@
-author: "Ghommie"
-delete-after: True
-changes:
- - bugfix: "Insert snarky remark about clock welders actually displaying the welder flame overlay when turned on now here."
diff --git a/html/changelogs/AutoChangeLog-pr-9703.yml b/html/changelogs/AutoChangeLog-pr-9703.yml
deleted file mode 100644
index 312057c2c6..0000000000
--- a/html/changelogs/AutoChangeLog-pr-9703.yml
+++ /dev/null
@@ -1,4 +0,0 @@
-author: "kevinz000"
-delete-after: True
-changes:
- - balance: "Emagged medibots now charcoal toxinlovers."
diff --git a/html/changelogs/AutoChangeLog-pr-9704.yml b/html/changelogs/AutoChangeLog-pr-9704.yml
deleted file mode 100644
index f4c8127241..0000000000
--- a/html/changelogs/AutoChangeLog-pr-9704.yml
+++ /dev/null
@@ -1,4 +0,0 @@
-author: "Ghommie"
-delete-after: True
-changes:
- - balance: "Minor ninja tweaks and stealth nerfs. The stealth penalty for the many combat-related actions, bumping and now teleporting/dashing or firing guns has been increased a by a third. There is now a cooldown of 5 seconds on toggling stealth as well as a slighty slowed stealth in/out animation."
diff --git a/html/changelogs/AutoChangeLog-pr-9705.yml b/html/changelogs/AutoChangeLog-pr-9705.yml
deleted file mode 100644
index c3dafc0582..0000000000
--- a/html/changelogs/AutoChangeLog-pr-9705.yml
+++ /dev/null
@@ -1,4 +0,0 @@
-author: "kappa-sama"
-delete-after: True
-changes:
- - tweak: "changed flavor text of alien tech on uplink"
diff --git a/html/changelogs/AutoChangeLog-pr-9709.yml b/html/changelogs/AutoChangeLog-pr-9709.yml
deleted file mode 100644
index 73d3164433..0000000000
--- a/html/changelogs/AutoChangeLog-pr-9709.yml
+++ /dev/null
@@ -1,5 +0,0 @@
-author: "Trilbyspaceclone"
-delete-after: True
-changes:
- - rscadd: "8 new cargo crates!"
- - tweak: "tablet cargo crate by -3k"
diff --git a/html/changelogs/AutoChangeLog-pr-9710.yml b/html/changelogs/AutoChangeLog-pr-9710.yml
deleted file mode 100644
index fc815f5255..0000000000
--- a/html/changelogs/AutoChangeLog-pr-9710.yml
+++ /dev/null
@@ -1,5 +0,0 @@
-author: "Trilbyspaceclone"
-delete-after: True
-changes:
- - admin: "Closes a bunch of issues"
- - server: "updates changlogs and such"
diff --git a/html/changelogs/AutoChangeLog-pr-9715.yml b/html/changelogs/AutoChangeLog-pr-9715.yml
deleted file mode 100644
index a7cfb50426..0000000000
--- a/html/changelogs/AutoChangeLog-pr-9715.yml
+++ /dev/null
@@ -1,4 +0,0 @@
-author: "Ghommie"
-delete-after: True
-changes:
- - imageadd: "Ported slighty better matchbox sprites from CEV-Eris, also resprited cigar boxes myself."
diff --git a/html/changelogs/AutoChangeLog-pr-9716.yml b/html/changelogs/AutoChangeLog-pr-9716.yml
deleted file mode 100644
index 704b263b50..0000000000
--- a/html/changelogs/AutoChangeLog-pr-9716.yml
+++ /dev/null
@@ -1,4 +0,0 @@
-author: "Ghommie"
-delete-after: True
-changes:
- - bugfix: "Fixed abductors/abductees objectives by porting an objective code."
diff --git a/html/changelogs/AutoChangeLog-pr-9717.yml b/html/changelogs/AutoChangeLog-pr-9717.yml
deleted file mode 100644
index 7ac1988b74..0000000000
--- a/html/changelogs/AutoChangeLog-pr-9717.yml
+++ /dev/null
@@ -1,4 +0,0 @@
-author: "Putnam3145"
-delete-after: True
-changes:
- - tweak: "SDGF now copies memories as well as antag data and factions."
diff --git a/html/changelogs/AutoChangeLog-pr-9720.yml b/html/changelogs/AutoChangeLog-pr-9720.yml
deleted file mode 100644
index f4c4aade36..0000000000
--- a/html/changelogs/AutoChangeLog-pr-9720.yml
+++ /dev/null
@@ -1,4 +0,0 @@
-author: "kevinz000"
-delete-after: True
-changes:
- - balance: "disablers buffed 0.7 --> 0.6 speed 24 --> 28 damage"
diff --git a/html/changelogs/AutoChangeLog-pr-9726.yml b/html/changelogs/AutoChangeLog-pr-9726.yml
deleted file mode 100644
index 9e8f3bf71e..0000000000
--- a/html/changelogs/AutoChangeLog-pr-9726.yml
+++ /dev/null
@@ -1,4 +0,0 @@
-author: "Ghommie"
-delete-after: True
-changes:
- - bugfix: "fixing a few runtimes on lightgeists, libido trait, rcd, one admin transformation topic, chem dispensers, glowing robotic eyes..."
diff --git a/html/changelogs/AutoChangeLog-pr-9730.yml b/html/changelogs/AutoChangeLog-pr-9730.yml
deleted file mode 100644
index 6caf95bcbc..0000000000
--- a/html/changelogs/AutoChangeLog-pr-9730.yml
+++ /dev/null
@@ -1,4 +0,0 @@
-author: "kevinz000"
-delete-after: True
-changes:
- - balance: "kinetic crushers no longer drop if you try to use it with one hand"
diff --git a/html/changelogs/AutoChangeLog-pr-9734.yml b/html/changelogs/AutoChangeLog-pr-9734.yml
deleted file mode 100644
index dd134e480c..0000000000
--- a/html/changelogs/AutoChangeLog-pr-9734.yml
+++ /dev/null
@@ -1,4 +0,0 @@
-author: "Ghommie"
-delete-after: True
-changes:
- - imageadd: "Porting CEV-eris delivery packages sprites and dunking the old syndie cybernetics box sprite."
diff --git a/html/changelogs/AutoChangeLog-pr-9736.yml b/html/changelogs/AutoChangeLog-pr-9736.yml
new file mode 100644
index 0000000000..768474b8ef
--- /dev/null
+++ b/html/changelogs/AutoChangeLog-pr-9736.yml
@@ -0,0 +1,4 @@
+author: "kevinz000"
+delete-after: True
+changes:
+ - code_imp: "Antag rep proc is now easier to read and supports returning a list."
diff --git a/html/changelogs/AutoChangeLog-pr-9745.yml b/html/changelogs/AutoChangeLog-pr-9745.yml
deleted file mode 100644
index 95a6d943b5..0000000000
--- a/html/changelogs/AutoChangeLog-pr-9745.yml
+++ /dev/null
@@ -1,4 +0,0 @@
-author: "Ghommie"
-delete-after: True
-changes:
- - bugfix: "Certain objects shouldn't be able to become radioactive because of a bitflag that previously was checked nowhere in the code anymore."
diff --git a/html/changelogs/AutoChangeLog-pr-9746.yml b/html/changelogs/AutoChangeLog-pr-9746.yml
deleted file mode 100644
index e4b1c312ea..0000000000
--- a/html/changelogs/AutoChangeLog-pr-9746.yml
+++ /dev/null
@@ -1,4 +0,0 @@
-author: "actioninja"
-delete-after: True
-changes:
- - bugfix: "med records no longer can eat id cards for no reason"
diff --git a/html/changelogs/AutoChangeLog-pr-9747.yml b/html/changelogs/AutoChangeLog-pr-9747.yml
new file mode 100644
index 0000000000..01caf36136
--- /dev/null
+++ b/html/changelogs/AutoChangeLog-pr-9747.yml
@@ -0,0 +1,4 @@
+author: "Ghommie"
+delete-after: True
+changes:
+ - bugfix: "Fixed AI holopad speech text being small and whispers that in multiple exclamation marks echo through multiple areas."
diff --git a/html/changelogs/AutoChangeLog-pr-9749.yml b/html/changelogs/AutoChangeLog-pr-9749.yml
deleted file mode 100644
index 3113fa08c3..0000000000
--- a/html/changelogs/AutoChangeLog-pr-9749.yml
+++ /dev/null
@@ -1,4 +0,0 @@
-author: "Trilbyspaceclone"
-delete-after: True
-changes:
- - balance: "Boh cant hold WEIGHT_CLASS_GIGANTIC, just Bulky. Makes katana, chainsaw and base ball bat into bulky items so they may fit"
diff --git a/html/changelogs/AutoChangeLog-pr-9751.yml b/html/changelogs/AutoChangeLog-pr-9751.yml
new file mode 100644
index 0000000000..a2c22468c3
--- /dev/null
+++ b/html/changelogs/AutoChangeLog-pr-9751.yml
@@ -0,0 +1,5 @@
+author: "Seris02"
+delete-after: True
+changes:
+ - rscadd: "Added Rising Bass and the shifting scroll."
+ - tweak: "Changes the martial arts scroll in the uplink to \"Sleeping Carp Scroll\""
diff --git a/html/changelogs/AutoChangeLog-pr-9764.yml b/html/changelogs/AutoChangeLog-pr-9764.yml
deleted file mode 100644
index a3ad009e81..0000000000
--- a/html/changelogs/AutoChangeLog-pr-9764.yml
+++ /dev/null
@@ -1,4 +0,0 @@
-author: "AffectedArc07"
-delete-after: True
-changes:
- - code_imp: "Fixes a LOT of code edge cases"
diff --git a/html/changelogs/AutoChangeLog-pr-9765.yml b/html/changelogs/AutoChangeLog-pr-9765.yml
deleted file mode 100644
index 1cb21916cc..0000000000
--- a/html/changelogs/AutoChangeLog-pr-9765.yml
+++ /dev/null
@@ -1,5 +0,0 @@
-author: "dapnee"
-delete-after: True
-changes:
- - bugfix: "fixed closet initialisation being broken"
- - rscdel: "emergency closets no longer have a 1% chance to delete themselves"
diff --git a/html/changelogs/AutoChangeLog-pr-9769.yml b/html/changelogs/AutoChangeLog-pr-9769.yml
deleted file mode 100644
index 2a1f92f68c..0000000000
--- a/html/changelogs/AutoChangeLog-pr-9769.yml
+++ /dev/null
@@ -1,15 +0,0 @@
-author: "XDTM, ShizCalev, Naksu, Skoglol, cacogen, Rohesie (ported by Ghommie)"
-delete-after: True
-changes:
- - tweak: "Holding an ID in your hands uses it instead of your worn ID for authentication purposes."
- - tweak: "If you don't have an ID in your id slot, the belt slot will be checked as well."
- - code_imp: "small cleanup to id and bounty console html generation"
- - tweak: "Hop console now hurts your eyes less. Red button text replaced with green."
- - tweak: "IDs with ID console access now go into the Confirm Identity slot by default like they used to, similarly IDs without it go into the Target slot by default again"
- - rscadd: "Can easily swap out IDs by clicking the machine or the UI fields with another ID"
- - rscadd: "ID console now names which IDs are added/removed in its visible messages"
- - rscadd: "Labels the ID slot fields when logged in so you know which is which"
- - tweak: "Can use Job Management without an ID provided the console is logged in (matches how the console now stays logged in even without an ID)"
- - tweak: "Can log in without an ID in the Target field (matches how the machine now stays logged in even after the ID is removed from the Target field)"
- - tweak: "Cleans up UI slightly (had some duplicate/conflicting buttons)"
- - bugfix: "Fixes ID console duping issues. Includes some ID containers, such as PDAs, tablets and wallets, into the swapping behavior when an ID card is being removed and the item is being held."
diff --git a/html/changelogs/AutoChangeLog-pr-9771.yml b/html/changelogs/AutoChangeLog-pr-9771.yml
deleted file mode 100644
index 55652519e4..0000000000
--- a/html/changelogs/AutoChangeLog-pr-9771.yml
+++ /dev/null
@@ -1,8 +0,0 @@
-author: "Robustin, Subject217"
-delete-after: True
-changes:
- - balance: "The NukeOp Shuttle hull has been dramatically hardened. The walls are now \"R-Walls\" with far greater explosion resistance."
- - balance: "The NukeOp Shuttle guns have been significantly buffed. They now rapidly fire a new type of penetrator round, at a greater range, and have far greater explosion resistance."
- - balance: "The nuclear device on the NukeOp Shuttle is now in an anchored state by default, the Nuke can only be unanchored by inserting the disk and entering the proper code."
- - balance: "Non-Syndicate cyborgs are now unable to access the NukeOp Shuttle Console."
- - bugfix: "You can now unanchor Nukes even when the floor under them has been destroyed"
diff --git a/html/changelogs/AutoChangeLog-pr-9772.yml b/html/changelogs/AutoChangeLog-pr-9772.yml
deleted file mode 100644
index 675b9a9cde..0000000000
--- a/html/changelogs/AutoChangeLog-pr-9772.yml
+++ /dev/null
@@ -1,7 +0,0 @@
-author: "DeltaFire15"
-delete-after: True
-changes:
- - rscadd: "Adds eight new plushies"
- - imageadd: "Adds icons for the new plushies and adds a new icon for the skylar plush"
- - imagedel: "Deleted a old, no-longer used icon for the skylar plush"
- - spellcheck: "Fixed a typo in the trilby plush"
diff --git a/html/changelogs/AutoChangeLog-pr-9773.yml b/html/changelogs/AutoChangeLog-pr-9773.yml
deleted file mode 100644
index e02fe07a37..0000000000
--- a/html/changelogs/AutoChangeLog-pr-9773.yml
+++ /dev/null
@@ -1,4 +0,0 @@
-author: "Ghommie"
-delete-after: True
-changes:
- - rscadd: "Added a new PDA reskin, sprites from CEV-Eris"
diff --git a/html/changelogs/AutoChangeLog-pr-9775.yml b/html/changelogs/AutoChangeLog-pr-9775.yml
deleted file mode 100644
index 07ed8efdbe..0000000000
--- a/html/changelogs/AutoChangeLog-pr-9775.yml
+++ /dev/null
@@ -1,7 +0,0 @@
-author: "nemvar"
-delete-after: True
-changes:
- - tweak: "The lavaland clown ruin has some new pranks ready."
- - rscadd: "Added a new loot item to the lavaland clown ruin."
- - rscdel: "Removed the slime core from said ruin."
- - balance: "The clown PDA now properly slips people on jogging move intent regardless of fatigue. Honkmother's will."
diff --git a/html/changelogs/AutoChangeLog-pr-9779.yml b/html/changelogs/AutoChangeLog-pr-9779.yml
deleted file mode 100644
index b6d1046957..0000000000
--- a/html/changelogs/AutoChangeLog-pr-9779.yml
+++ /dev/null
@@ -1,6 +0,0 @@
-author: "Ghommie"
-delete-after: True
-changes:
- - rscadd: "Clock cult starts with some spare vitality matrix charge scaled of the number of starter servants."
- - balance: "Made the vitality matrix sigil slighty more visible, also allowed conversion runes to heal fresh converts at the cost of some vitality charge."
- - bugfix: "Crawling won't save you from the wrath of ocular wardens and pressure sensors anymore, heretics. fix: Pressure sensors are no more triggered by floating/flying mobs."
diff --git a/html/changelogs/AutoChangeLog-pr-9780.yml b/html/changelogs/AutoChangeLog-pr-9780.yml
deleted file mode 100644
index b014218fbc..0000000000
--- a/html/changelogs/AutoChangeLog-pr-9780.yml
+++ /dev/null
@@ -1,4 +0,0 @@
-author: "Hatterhat"
-delete-after: True
-changes:
- - tweak: "The Big Red Button now sets bomb timers to 2 seconds, instead of 5."
diff --git a/html/changelogs/AutoChangeLog-pr-9781.yml b/html/changelogs/AutoChangeLog-pr-9781.yml
deleted file mode 100644
index c8e73b3b9d..0000000000
--- a/html/changelogs/AutoChangeLog-pr-9781.yml
+++ /dev/null
@@ -1,4 +0,0 @@
-author: "Hatterhat"
-delete-after: True
-changes:
- - tweak: "Gloves of the North Star (not Hugs of the North Star) now use all their intents very, very fast. This does not apply to grabs' click cooldown, nor shoving people."
diff --git a/html/changelogs/AutoChangeLog-pr-9782.yml b/html/changelogs/AutoChangeLog-pr-9782.yml
deleted file mode 100644
index f29da71edc..0000000000
--- a/html/changelogs/AutoChangeLog-pr-9782.yml
+++ /dev/null
@@ -1,4 +0,0 @@
-author: "Ghommie"
-delete-after: True
-changes:
- - bugfix: "Strawberry milk and tea have sprites now."
diff --git a/html/changelogs/AutoChangeLog-pr-9783.yml b/html/changelogs/AutoChangeLog-pr-9783.yml
deleted file mode 100644
index 0362b582f6..0000000000
--- a/html/changelogs/AutoChangeLog-pr-9783.yml
+++ /dev/null
@@ -1,4 +0,0 @@
-author: "Ghommie"
-delete-after: True
-changes:
- - bugfix: "Fixed the Aux base camera door settings and toggle window type actions. Also enabling the user to modify both door access and type."
diff --git a/html/changelogs/AutoChangeLog-pr-9785.yml b/html/changelogs/AutoChangeLog-pr-9785.yml
deleted file mode 100644
index 17d4f5325b..0000000000
--- a/html/changelogs/AutoChangeLog-pr-9785.yml
+++ /dev/null
@@ -1,5 +0,0 @@
-author: "Ghommie"
-delete-after: True
-changes:
- - imageadd: "Improved the two grayscale towel item sprites a little."
- - bugfix: "Fixed towels onmob suit overlays. Again."
diff --git a/html/changelogs/AutoChangeLog-pr-9786.yml b/html/changelogs/AutoChangeLog-pr-9786.yml
deleted file mode 100644
index f8b69521cb..0000000000
--- a/html/changelogs/AutoChangeLog-pr-9786.yml
+++ /dev/null
@@ -1,4 +0,0 @@
-author: "Ghommie"
-delete-after: True
-changes:
- - spellcheck: "Fixed some reagents taste descriptions."
diff --git a/html/changelogs/AutoChangeLog-pr-9788.yml b/html/changelogs/AutoChangeLog-pr-9788.yml
deleted file mode 100644
index 503f3dbb0e..0000000000
--- a/html/changelogs/AutoChangeLog-pr-9788.yml
+++ /dev/null
@@ -1,4 +0,0 @@
-author: "Seris02"
-delete-after: True
-changes:
- - tweak: "tweaked the way the tapered penis looks"
diff --git a/html/changelogs/AutoChangeLog-pr-9790.yml b/html/changelogs/AutoChangeLog-pr-9790.yml
deleted file mode 100644
index 4f243774c4..0000000000
--- a/html/changelogs/AutoChangeLog-pr-9790.yml
+++ /dev/null
@@ -1,4 +0,0 @@
-author: "PersianXerxes"
-delete-after: True
-changes:
- - tweak: "Reduces the grace period for meteors from a minimum of 5 and maximum of 10 to 3 and 6 minutes respectively."
diff --git a/html/changelogs/AutoChangeLog-pr-9791.yml b/html/changelogs/AutoChangeLog-pr-9791.yml
deleted file mode 100644
index 587fbce481..0000000000
--- a/html/changelogs/AutoChangeLog-pr-9791.yml
+++ /dev/null
@@ -1,4 +0,0 @@
-author: "kappa-sama"
-delete-after: True
-changes:
- - imageadd: "added TG's icons for traitor, russian, and golden revolver"
diff --git a/html/changelogs/AutoChangeLog-pr-9797.yml b/html/changelogs/AutoChangeLog-pr-9797.yml
deleted file mode 100644
index eb50cb7254..0000000000
--- a/html/changelogs/AutoChangeLog-pr-9797.yml
+++ /dev/null
@@ -1,7 +0,0 @@
-author: "PersianXerxes"
-delete-after: True
-changes:
- - rscadd: "Adds a pair of VR sleepers to Box Station's permabrig"
- - rscadd: "Adds a pair of VR sleepers to Delta Station's permabrig"
- - rscadd: "Adds a pair of VR sleepers to Pubby Station's permabrig"
- - rscadd: "Adds a pair of VR sleepers to Meta Station's permabrig"
diff --git a/html/changelogs/AutoChangeLog-pr-9800.yml b/html/changelogs/AutoChangeLog-pr-9800.yml
deleted file mode 100644
index 244518bd40..0000000000
--- a/html/changelogs/AutoChangeLog-pr-9800.yml
+++ /dev/null
@@ -1,4 +0,0 @@
-author: "Trilbyspaceclone"
-delete-after: True
-changes:
- - server: "changes header to be more cit-like"
diff --git a/html/changelogs/AutoChangeLog-pr-9801.yml b/html/changelogs/AutoChangeLog-pr-9801.yml
deleted file mode 100644
index 986f271fd8..0000000000
--- a/html/changelogs/AutoChangeLog-pr-9801.yml
+++ /dev/null
@@ -1,4 +0,0 @@
-author: "Ghommie"
-delete-after: True
-changes:
- - bugfix: "Fixed hidden random event reports only priting a paper message without sending the message to the consoles' message list."
diff --git a/html/changelogs/AutoChangeLog-pr-9802.yml b/html/changelogs/AutoChangeLog-pr-9802.yml
deleted file mode 100644
index 183515f5f1..0000000000
--- a/html/changelogs/AutoChangeLog-pr-9802.yml
+++ /dev/null
@@ -1,5 +0,0 @@
-author: "Ghommie"
-delete-after: True
-changes:
- - bugfix: "Rosary beads prayer now works on non-carbon mobs too, and won't break when performed on a monkey or other humanoids."
- - tweak: "You can flagellate people with rosary beads on harm intent. It's even mediocrer than the sord though."
diff --git a/html/changelogs/AutoChangeLog-pr-9803.yml b/html/changelogs/AutoChangeLog-pr-9803.yml
deleted file mode 100644
index cd81b52620..0000000000
--- a/html/changelogs/AutoChangeLog-pr-9803.yml
+++ /dev/null
@@ -1,6 +0,0 @@
-author: "Jerry Derpington, baldest of the balds, and nemvar."
-delete-after: True
-changes:
- - rscdel: "Nanotrasen has lost communication to two away mission sites that contained a beach for Nanotrasen employees."
- - rscadd: "Nanotrasen has been able to locate a new away mission site that ALSO has a beach. Nanotrasen employees will be able to enjoy the beach after all!"
- - rscadd: "Seashells have been added to the game."
diff --git a/html/changelogs/AutoChangeLog-pr-9805.yml b/html/changelogs/AutoChangeLog-pr-9805.yml
deleted file mode 100644
index 6f74b934f0..0000000000
--- a/html/changelogs/AutoChangeLog-pr-9805.yml
+++ /dev/null
@@ -1,5 +0,0 @@
-author: "Ghommie"
-delete-after: True
-changes:
- - tweak: "Moved the `Stealth and Camouflage Items` uplink category next to `Devices and Tools`."
- - bugfix: "Deleted a duplicate phatom thief mask entry from the uplink."
diff --git a/html/changelogs/AutoChangeLog-pr-9812.yml b/html/changelogs/AutoChangeLog-pr-9812.yml
deleted file mode 100644
index d669d20343..0000000000
--- a/html/changelogs/AutoChangeLog-pr-9812.yml
+++ /dev/null
@@ -1,4 +0,0 @@
-author: "Ghommie"
-delete-after: True
-changes:
- - bugfix: "Fixed missing delivery packages sprites"
diff --git a/html/changelogs/AutoChangeLog-pr-9813.yml b/html/changelogs/AutoChangeLog-pr-9813.yml
deleted file mode 100644
index fbf1c6f022..0000000000
--- a/html/changelogs/AutoChangeLog-pr-9813.yml
+++ /dev/null
@@ -1,4 +0,0 @@
-author: "ShizCalev"
-delete-after: True
-changes:
- - tweak: "Ghosts can now see active AI cameras."
diff --git a/html/changelogs/AutoChangeLog-pr-9814.yml b/html/changelogs/AutoChangeLog-pr-9814.yml
deleted file mode 100644
index 6e806b8860..0000000000
--- a/html/changelogs/AutoChangeLog-pr-9814.yml
+++ /dev/null
@@ -1,4 +0,0 @@
-author: "kevinz000"
-delete-after: True
-changes:
- - config: "added multi_keyed_list, delimiter defaults to |."
diff --git a/html/changelogs/AutoChangeLog-pr-9816.yml b/html/changelogs/AutoChangeLog-pr-9816.yml
deleted file mode 100644
index 512d60e7eb..0000000000
--- a/html/changelogs/AutoChangeLog-pr-9816.yml
+++ /dev/null
@@ -1,7 +0,0 @@
-author: "Swindly"
-delete-after: True
-changes:
- - bugfix: "Fixed MMIs not being able to use mecha equipment"
- - bugfix: "Fixed MMIs not getting mecha mouse pointers"
- - bugfix: "Fixed MMIs not getting medical HUDs in Odysseuses"
- - tweak: "Brains can now switch to harm intent"
diff --git a/html/changelogs/AutoChangeLog-pr-9818.yml b/html/changelogs/AutoChangeLog-pr-9818.yml
deleted file mode 100644
index 44222d2359..0000000000
--- a/html/changelogs/AutoChangeLog-pr-9818.yml
+++ /dev/null
@@ -1,5 +0,0 @@
-author: "GrayRachnid"
-delete-after: True
-changes:
- - rscadd: "Added saboteur syndicate engiborg"
- - tweak: "changed cyborg tool icons and the secborg taser/laser icons."
diff --git a/html/changelogs/AutoChangeLog-pr-9822.yml b/html/changelogs/AutoChangeLog-pr-9822.yml
deleted file mode 100644
index 425a667086..0000000000
--- a/html/changelogs/AutoChangeLog-pr-9822.yml
+++ /dev/null
@@ -1,6 +0,0 @@
-author: "Putnam3145"
-delete-after: True
-changes:
- - bugfix: "Summon events now properly costs threat."
- - bugfix: "Refunded spells refund threat, too."
- - refactor: "Made wizard spells inherently have a requirement and cost."
diff --git a/html/changelogs/AutoChangeLog-pr-9823.yml b/html/changelogs/AutoChangeLog-pr-9823.yml
deleted file mode 100644
index 3408f04171..0000000000
--- a/html/changelogs/AutoChangeLog-pr-9823.yml
+++ /dev/null
@@ -1,6 +0,0 @@
-author: "Seris02"
-delete-after: True
-changes:
- - rscadd: "Added nine winter coats"
- - imageadd: "added images for the winter coats"
- - tweak: "adds the mining winter coat to mining wardrobes and mining lockers"
diff --git a/html/changelogs/AutoChangeLog-pr-9828.yml b/html/changelogs/AutoChangeLog-pr-9828.yml
deleted file mode 100644
index 53dbebba28..0000000000
--- a/html/changelogs/AutoChangeLog-pr-9828.yml
+++ /dev/null
@@ -1,4 +0,0 @@
-author: "Putnam3145"
-delete-after: True
-changes:
- - tweak: "Meteor wave is no longer repeatable in dynamic."
diff --git a/html/changelogs/AutoChangeLog-pr-9830.yml b/html/changelogs/AutoChangeLog-pr-9830.yml
new file mode 100644
index 0000000000..86fb9c439a
--- /dev/null
+++ b/html/changelogs/AutoChangeLog-pr-9830.yml
@@ -0,0 +1,4 @@
+author: "DeltaFire15"
+delete-after: True
+changes:
+ - balance: "Rebalanced cult vs cult stun effects to debuff instead of stun"
diff --git a/html/changelogs/AutoChangeLog-pr-9835.yml b/html/changelogs/AutoChangeLog-pr-9835.yml
deleted file mode 100644
index 675eedef02..0000000000
--- a/html/changelogs/AutoChangeLog-pr-9835.yml
+++ /dev/null
@@ -1,4 +0,0 @@
-author: "Ty-the-Smonk"
-delete-after: True
-changes:
- - bugfix: "You can now interact with self sustaining crossbreeds"
diff --git a/html/changelogs/AutoChangeLog-pr-9837.yml b/html/changelogs/AutoChangeLog-pr-9837.yml
deleted file mode 100644
index a20d04effc..0000000000
--- a/html/changelogs/AutoChangeLog-pr-9837.yml
+++ /dev/null
@@ -1,4 +0,0 @@
-author: "Fox McCloud"
-delete-after: True
-changes:
- - bugfix: "Fixes a very longstanding LINDA bug where turfs adjacent to a hotspot would be less prone to igniting"
diff --git a/html/changelogs/AutoChangeLog-pr-9838.yml b/html/changelogs/AutoChangeLog-pr-9838.yml
deleted file mode 100644
index 5a99c27abe..0000000000
--- a/html/changelogs/AutoChangeLog-pr-9838.yml
+++ /dev/null
@@ -1,4 +0,0 @@
-author: "actioninja"
-delete-after: True
-changes:
- - bugfix: "Chat is properly sent to legacy window if goonchat fails to load again."
diff --git a/html/changelogs/AutoChangeLog-pr-9842.yml b/html/changelogs/AutoChangeLog-pr-9842.yml
deleted file mode 100644
index d816911560..0000000000
--- a/html/changelogs/AutoChangeLog-pr-9842.yml
+++ /dev/null
@@ -1,4 +0,0 @@
-author: "Anonymous"
-delete-after: True
-changes:
- - tweak: "Renamed loadout name appropriately (ASSU -> DAB)"
diff --git a/html/changelogs/AutoChangeLog-pr-9846.yml b/html/changelogs/AutoChangeLog-pr-9846.yml
deleted file mode 100644
index d3721b6c32..0000000000
--- a/html/changelogs/AutoChangeLog-pr-9846.yml
+++ /dev/null
@@ -1,5 +0,0 @@
-author: "KathrinBailey"
-delete-after: True
-changes:
- - rscadd: "Ports TG's pews https://github.com/tgstation/tgstation/pull/42712"
- - rscadd: "The first step of a corporate incursion of Space IKEA into Nanotrasen."
diff --git a/html/changelogs/AutoChangeLog-pr-9850.yml b/html/changelogs/AutoChangeLog-pr-9850.yml
deleted file mode 100644
index f6aee261a4..0000000000
--- a/html/changelogs/AutoChangeLog-pr-9850.yml
+++ /dev/null
@@ -1,4 +0,0 @@
-author: "Ghommie"
-delete-after: True
-changes:
- - bugfix: "fixed a few minor issues with console frames building."
diff --git a/html/changelogs/AutoChangeLog-pr-9852.yml b/html/changelogs/AutoChangeLog-pr-9852.yml
deleted file mode 100644
index 4a17480992..0000000000
--- a/html/changelogs/AutoChangeLog-pr-9852.yml
+++ /dev/null
@@ -1,5 +0,0 @@
-author: "Ghommie"
-delete-after: True
-changes:
- - bugfix: "Wizards can use the teleport spell from their den once again."
- - tweak: "Wizards will now receive feedback messages when attempting to cast teleport or use the warp whistle while in a no-teleport area."
diff --git a/html/changelogs/AutoChangeLog-pr-9853.yml b/html/changelogs/AutoChangeLog-pr-9853.yml
deleted file mode 100644
index f752f6bf16..0000000000
--- a/html/changelogs/AutoChangeLog-pr-9853.yml
+++ /dev/null
@@ -1,4 +0,0 @@
-author: "Ghommie"
-delete-after: True
-changes:
- - rscadd: "New clockwork cultist, gondola, monkey and securitron cardboard cutouts."
diff --git a/html/changelogs/AutoChangeLog-pr-9858.yml b/html/changelogs/AutoChangeLog-pr-9858.yml
deleted file mode 100644
index c211cd5962..0000000000
--- a/html/changelogs/AutoChangeLog-pr-9858.yml
+++ /dev/null
@@ -1,4 +0,0 @@
-author: "Ghommie"
-delete-after: True
-changes:
- - bugfix: "Fixed aliens gasping randomly once in a while."
diff --git a/html/changelogs/AutoChangeLog-pr-9864.yml b/html/changelogs/AutoChangeLog-pr-9864.yml
deleted file mode 100644
index ff1f4f6508..0000000000
--- a/html/changelogs/AutoChangeLog-pr-9864.yml
+++ /dev/null
@@ -1,5 +0,0 @@
-author: "Knouli"
-delete-after: True
-changes:
- - rscadd: "attack_self proc for the legion core which triggers a self-heal al la the previous 'afterattack' proc, as if clicking on the character's own sprite to self-heal"
- - rscadd: "admin logging for all three use cases of legion core healing - afterattack, attack_self, and implanted ui_action_click"
diff --git a/html/changelogs/AutoChangeLog-pr-9865.yml b/html/changelogs/AutoChangeLog-pr-9865.yml
deleted file mode 100644
index 6bef9d6b5b..0000000000
--- a/html/changelogs/AutoChangeLog-pr-9865.yml
+++ /dev/null
@@ -1,4 +0,0 @@
-author: "Useroth"
-delete-after: True
-changes:
- - bugfix: "numbered storages now are sorted in a consistent way, instead of depending on ordering of their contents var"
diff --git a/html/changelogs/AutoChangeLog-pr-9866.yml b/html/changelogs/AutoChangeLog-pr-9866.yml
deleted file mode 100644
index 1e6e8d0e88..0000000000
--- a/html/changelogs/AutoChangeLog-pr-9866.yml
+++ /dev/null
@@ -1,4 +0,0 @@
-author: "Useroth"
-delete-after: True
-changes:
- - rscadd: "strange seeds as a buyable traitor botanist item"
diff --git a/html/changelogs/AutoChangeLog-pr-9867.yml b/html/changelogs/AutoChangeLog-pr-9867.yml
deleted file mode 100644
index 4333d5eb73..0000000000
--- a/html/changelogs/AutoChangeLog-pr-9867.yml
+++ /dev/null
@@ -1,6 +0,0 @@
-author: "Naksu, ShizCalev"
-delete-after: True
-changes:
- - refactor: "Refactored examine-code"
- - bugfix: "Examining a human with a burned prosthetic limb will no longer tell you that the limb is blistered."
- - tweak: "Items will now inform you if they are resistant to frost, fire, acid, and lava when examined."
diff --git a/html/changelogs/AutoChangeLog-pr-9868.yml b/html/changelogs/AutoChangeLog-pr-9868.yml
deleted file mode 100644
index 18c4388dcd..0000000000
--- a/html/changelogs/AutoChangeLog-pr-9868.yml
+++ /dev/null
@@ -1,4 +0,0 @@
-author: "Ghommie"
-delete-after: True
-changes:
- - bugfix: "fixed superlube waterflower, my bad."
diff --git a/html/changelogs/AutoChangeLog-pr-9869.yml b/html/changelogs/AutoChangeLog-pr-9869.yml
deleted file mode 100644
index ecb3ac6cb7..0000000000
--- a/html/changelogs/AutoChangeLog-pr-9869.yml
+++ /dev/null
@@ -1,4 +0,0 @@
-author: "Hatterhat"
-delete-after: True
-changes:
- - rscadd: "The seedvault/alien plant DNA manipulator can now be printed off with Alien Biotechnology."
diff --git a/html/changelogs/AutoChangeLog-pr-9871.yml b/html/changelogs/AutoChangeLog-pr-9871.yml
deleted file mode 100644
index 3940d256c2..0000000000
--- a/html/changelogs/AutoChangeLog-pr-9871.yml
+++ /dev/null
@@ -1,5 +0,0 @@
-author: "dzahlus"
-delete-after: True
-changes:
- - soundadd: "added a new gun sounds"
- - sounddel: "removed an old gun sounds"
diff --git a/html/changelogs/AutoChangeLog-pr-9873.yml b/html/changelogs/AutoChangeLog-pr-9873.yml
deleted file mode 100644
index b0568bad14..0000000000
--- a/html/changelogs/AutoChangeLog-pr-9873.yml
+++ /dev/null
@@ -1,5 +0,0 @@
-author: "Ghommie"
-delete-after: True
-changes:
- - bugfix: "Fixed closing the aux base construction RCD's door access settings window throwing you out of camera mode when closed."
- - rscdel: "Removed not functional aux base RCD's door type menu. Use airlock painters, maybe."
diff --git a/html/changelogs/AutoChangeLog-pr-9874.yml b/html/changelogs/AutoChangeLog-pr-9874.yml
deleted file mode 100644
index 2e932c458b..0000000000
--- a/html/changelogs/AutoChangeLog-pr-9874.yml
+++ /dev/null
@@ -1,4 +0,0 @@
-author: "Ghommie"
-delete-after: True
-changes:
- - rscadd: "Honkbot oil spills are of the slippery kind now. Honk."
diff --git a/html/changelogs/AutoChangeLog-pr-9875.yml b/html/changelogs/AutoChangeLog-pr-9875.yml
deleted file mode 100644
index 4e14a561e7..0000000000
--- a/html/changelogs/AutoChangeLog-pr-9875.yml
+++ /dev/null
@@ -1,4 +0,0 @@
-author: "Putnam"
-delete-after: True
-changes:
- - bugfix: "From-ghosts dynamic rulesets now actually listen to \"required candidates\""
diff --git a/html/changelogs/AutoChangeLog-pr-9876.yml b/html/changelogs/AutoChangeLog-pr-9876.yml
deleted file mode 100644
index 4bc0a19954..0000000000
--- a/html/changelogs/AutoChangeLog-pr-9876.yml
+++ /dev/null
@@ -1,4 +0,0 @@
-author: "Ghommie"
-delete-after: True
-changes:
- - imageadd: "local code scavenger finds forgotten slighty improved apc sprites left buried in old dusty folders."
diff --git a/html/changelogs/AutoChangeLog-pr-9877.yml b/html/changelogs/AutoChangeLog-pr-9877.yml
deleted file mode 100644
index c84cb7aa92..0000000000
--- a/html/changelogs/AutoChangeLog-pr-9877.yml
+++ /dev/null
@@ -1,4 +0,0 @@
-author: "Ghommie"
-delete-after: True
-changes:
- - bugfix: "Seven old and otherwordly pAI holochassis icons have crawled their way out of the modular citadel catacombs."
diff --git a/html/changelogs/AutoChangeLog-pr-9880.yml b/html/changelogs/AutoChangeLog-pr-9880.yml
deleted file mode 100644
index 0f9dfa58f3..0000000000
--- a/html/changelogs/AutoChangeLog-pr-9880.yml
+++ /dev/null
@@ -1,4 +0,0 @@
-author: "Putnam"
-delete-after: True
-changes:
- - bugfix: "Every dynamic-triggered event is now blacklisted from being triggered by the random events system when dynamic can trigger them."
diff --git a/html/changelogs/AutoChangeLog-pr-9881.yml b/html/changelogs/AutoChangeLog-pr-9881.yml
deleted file mode 100644
index 3ff9081e66..0000000000
--- a/html/changelogs/AutoChangeLog-pr-9881.yml
+++ /dev/null
@@ -1,4 +0,0 @@
-author: "Putnam"
-delete-after: True
-changes:
- - rscadd: "Dynamic voting now features extended, if recent rounds have been chaotic."
diff --git a/html/changelogs/AutoChangeLog-pr-9882.yml b/html/changelogs/AutoChangeLog-pr-9882.yml
deleted file mode 100644
index 581149a51f..0000000000
--- a/html/changelogs/AutoChangeLog-pr-9882.yml
+++ /dev/null
@@ -1,4 +0,0 @@
-author: "Fermis"
-delete-after: True
-changes:
- - refactor: "refactored sleepers!"
diff --git a/html/changelogs/AutoChangeLog-pr-9884.yml b/html/changelogs/AutoChangeLog-pr-9884.yml
deleted file mode 100644
index 598fd7f4e6..0000000000
--- a/html/changelogs/AutoChangeLog-pr-9884.yml
+++ /dev/null
@@ -1,5 +0,0 @@
-author: "Useroth"
-delete-after: True
-changes:
- - bugfix: "resolves the issues revolving around blackpowder exploding where the reaction happened, instead of where it actually is through making it explode instantly"
- - tweak: "the explosion delay moved from blackpowder directly into bomb cherries, to keep them functioning as intended"
diff --git a/html/changelogs/AutoChangeLog-pr-9886.yml b/html/changelogs/AutoChangeLog-pr-9886.yml
deleted file mode 100644
index 64c011e37c..0000000000
--- a/html/changelogs/AutoChangeLog-pr-9886.yml
+++ /dev/null
@@ -1,5 +0,0 @@
-author: "Ghommie"
-delete-after: True
-changes:
- - bugfix: "chem dispenser beakers end up in your hand yet again."
- - bugfix: "Bikehorns squeak yet again, the world is safe."
diff --git a/html/changelogs/AutoChangeLog-pr-9887.yml b/html/changelogs/AutoChangeLog-pr-9887.yml
deleted file mode 100644
index c76016575b..0000000000
--- a/html/changelogs/AutoChangeLog-pr-9887.yml
+++ /dev/null
@@ -1,7 +0,0 @@
-author: "Fox McCloud, Ghommie"
-delete-after: True
-changes:
- - bugfix: "Fixes being able to mech-punch other mobs, as a pacifist"
- - bugfix: "Fixes being able to hurt people, as a pacifist, by throwing them into a wall or other mob, or by using most martial arts (save for the unpredictable psychotic brawl, and the stamina-damage-only boxing)."
- - balance: "Buffs boxing to outdamage natural stamina regeneration. Made the chance of outright missing your opponent actually possible."
- - tweak: "Pacifists can now engage in the (laughably not harmful) sweet sweet art of boxing now."
diff --git a/html/changelogs/AutoChangeLog-pr-9889.yml b/html/changelogs/AutoChangeLog-pr-9889.yml
deleted file mode 100644
index 68094bd33d..0000000000
--- a/html/changelogs/AutoChangeLog-pr-9889.yml
+++ /dev/null
@@ -1,4 +0,0 @@
-author: "GrayRachnid"
-delete-after: True
-changes:
- - bugfix: "Fixes golden toolbox missing inhand sprite"
diff --git a/html/changelogs/AutoChangeLog-pr-9891.yml b/html/changelogs/AutoChangeLog-pr-9891.yml
deleted file mode 100644
index 105749ea29..0000000000
--- a/html/changelogs/AutoChangeLog-pr-9891.yml
+++ /dev/null
@@ -1,4 +0,0 @@
-author: "Putnam"
-delete-after: True
-changes:
- - tweak: "Roundstart rulesets now scale on population ready rather than total population."
diff --git a/html/changelogs/AutoChangeLog-pr-9893.yml b/html/changelogs/AutoChangeLog-pr-9893.yml
deleted file mode 100644
index 157602a3b8..0000000000
--- a/html/changelogs/AutoChangeLog-pr-9893.yml
+++ /dev/null
@@ -1,5 +0,0 @@
-author: "Putnam"
-delete-after: True
-changes:
- - bugfix: "Threat log now accurately represents what actually used the threat."
- - tweak: "Verbose threat log (admin-only) now shows ALL threat level changes."
diff --git a/html/changelogs/AutoChangeLog-pr-9894.yml b/html/changelogs/AutoChangeLog-pr-9894.yml
new file mode 100644
index 0000000000..6e4b5c09d0
--- /dev/null
+++ b/html/changelogs/AutoChangeLog-pr-9894.yml
@@ -0,0 +1,5 @@
+author: "Putnam3145"
+delete-after: True
+changes:
+ - balance: "Bomb armor now acts like other armor types."
+ - balance: "Devastation-level explosions on armorless people no longer destroys everything in their bags."
diff --git a/html/changelogs/AutoChangeLog-pr-9895.yml b/html/changelogs/AutoChangeLog-pr-9895.yml
deleted file mode 100644
index 213e7cdb73..0000000000
--- a/html/changelogs/AutoChangeLog-pr-9895.yml
+++ /dev/null
@@ -1,10 +0,0 @@
-author: "Fermis"
-delete-after: True
-changes:
- - rscadd: "Organ fridges to all maps near surgery with a random sensible organ, steralizine and synthtissue."
- - tweak: "the med hand scanner to be less of a mishmash of random things"
- - rscadd: "a little icon to the HUD if someone's heart has failed."
- - tweak: "Lets neurine's brain splash attack work via syringe."
- - rscadd: "a new surgery; Emergency Cardioversion Induction for use on the recently deceased"
- - tweak: "Synthtissue to be less demanding on growth size for organ regeneration and improves clarify of it's growth gated effects."
- - tweak: "Synthtissue now is more useful than synthflesh on the dead"
diff --git a/html/changelogs/AutoChangeLog-pr-9896.yml b/html/changelogs/AutoChangeLog-pr-9896.yml
deleted file mode 100644
index 378129d227..0000000000
--- a/html/changelogs/AutoChangeLog-pr-9896.yml
+++ /dev/null
@@ -1,4 +0,0 @@
-author: "Ghommie"
-delete-after: True
-changes:
- - bugfix: "Cyborgs can now actually use cameras from a distance."
diff --git a/html/changelogs/AutoChangeLog-pr-9898.yml b/html/changelogs/AutoChangeLog-pr-9898.yml
deleted file mode 100644
index 002e3b544d..0000000000
--- a/html/changelogs/AutoChangeLog-pr-9898.yml
+++ /dev/null
@@ -1,4 +0,0 @@
-author: "Ghommie"
-delete-after: True
-changes:
- - bugfix: "Suicides are yet again painful and instant and won't throw people in deep crit from full health."
diff --git a/html/changelogs/AutoChangeLog-pr-9902.yml b/html/changelogs/AutoChangeLog-pr-9902.yml
deleted file mode 100644
index 9a9d7f4597..0000000000
--- a/html/changelogs/AutoChangeLog-pr-9902.yml
+++ /dev/null
@@ -1,6 +0,0 @@
-author: "Useroth"
-delete-after: True
-changes:
- - rscadd: "A bunch of newer tg plants"
- - rscadd: "A bunch of newer tg plant traits"
- - rscadd: "A couple of newer tg plant reagents"
diff --git a/html/changelogs/AutoChangeLog-pr-9903.yml b/html/changelogs/AutoChangeLog-pr-9903.yml
new file mode 100644
index 0000000000..0c21b30fd6
--- /dev/null
+++ b/html/changelogs/AutoChangeLog-pr-9903.yml
@@ -0,0 +1,4 @@
+author: "PersianXerxes"
+delete-after: True
+changes:
+ - rscdel: "Removed night vision quirk"
diff --git a/html/changelogs/AutoChangeLog-pr-9906.yml b/html/changelogs/AutoChangeLog-pr-9906.yml
deleted file mode 100644
index 67c5c20b58..0000000000
--- a/html/changelogs/AutoChangeLog-pr-9906.yml
+++ /dev/null
@@ -1,4 +0,0 @@
-author: "Xantholne"
-delete-after: True
-changes:
- - rscadd: "New Berets for most heads and departments available in their autodrobes or lockers"
diff --git a/html/changelogs/AutoChangeLog-pr-9907.yml b/html/changelogs/AutoChangeLog-pr-9907.yml
deleted file mode 100644
index 6bd27c6e50..0000000000
--- a/html/changelogs/AutoChangeLog-pr-9907.yml
+++ /dev/null
@@ -1,4 +0,0 @@
-author: "Putnam"
-delete-after: True
-changes:
- - bugfix: "VR mobs can no longer be dynamic midround antags."
diff --git a/html/changelogs/AutoChangeLog-pr-9908.yml b/html/changelogs/AutoChangeLog-pr-9908.yml
deleted file mode 100644
index fb0ae06238..0000000000
--- a/html/changelogs/AutoChangeLog-pr-9908.yml
+++ /dev/null
@@ -1,4 +0,0 @@
-author: "Ghommie"
-delete-after: True
-changes:
- - bugfix: "fixed rogue pixels on the energy gu- ahem blaster carbine... and a few apc lights states being neigh-indistinguishable."
diff --git a/html/changelogs/AutoChangeLog-pr-9909.yml b/html/changelogs/AutoChangeLog-pr-9909.yml
deleted file mode 100644
index 7cfb6ce5b2..0000000000
--- a/html/changelogs/AutoChangeLog-pr-9909.yml
+++ /dev/null
@@ -1,5 +0,0 @@
-author: "kiwedespars"
-delete-after: True
-changes:
- - rscdel: "removed moth fluff coloring you like your wings"
- - balance: "made insect not so bad."
diff --git a/html/changelogs/AutoChangeLog-pr-9913.yml b/html/changelogs/AutoChangeLog-pr-9913.yml
deleted file mode 100644
index 64b97f8828..0000000000
--- a/html/changelogs/AutoChangeLog-pr-9913.yml
+++ /dev/null
@@ -1,4 +0,0 @@
-author: "Trilbyspaceclone"
-delete-after: True
-changes:
- - rscadd: "new clothing for the hotel staff and a hat"
diff --git a/html/changelogs/AutoChangeLog-pr-9915.yml b/html/changelogs/AutoChangeLog-pr-9915.yml
deleted file mode 100644
index 652a942d13..0000000000
--- a/html/changelogs/AutoChangeLog-pr-9915.yml
+++ /dev/null
@@ -1,14 +0,0 @@
-author: "Owai-Seek"
-delete-after: True
-changes:
- - rscadd: "leg wraps and sweaters to clothesmate"
- - rscadd: "screwdriver and cable coil to janidrobe"
- - rscadd: "screwdriver and cable coil to janibelt whitelist (for fixing/placing light fixtures)"
- - rscadd: "monkey cube, syringe, enzyme, soy sauce, and cryoxadone to chef's vendor (contraband and premium)"
- - rscadd: "add cracker, beans, honey bars, lollipops, chocolate coin, and spider lollipop to snack vendors (contraband and premium)"
- - rscadd: "newspaper to loadout menu for bapping purposes"
- - rscdel: "removed poppy pretzels from snack vendor premium"
- - rscadd: "maid uniform (janimaid alt) to kinkmate."
- - tweak: "moves gear harness from premium to normal stock in kinkmate"
- - balance: "re-balanced metal shield bounty"
- - rscadd: "cryoxadone bottle (for use in chef vendor)"
diff --git a/html/changelogs/AutoChangeLog-pr-9919.yml b/html/changelogs/AutoChangeLog-pr-9919.yml
deleted file mode 100644
index 47b63b3357..0000000000
--- a/html/changelogs/AutoChangeLog-pr-9919.yml
+++ /dev/null
@@ -1,4 +0,0 @@
-author: "Ghommie"
-delete-after: True
-changes:
- - bugfix: "Fixed several \"behind\" layer tail sprites skipping areas normally covered by bodyparts."
diff --git a/html/changelogs/AutoChangeLog-pr-9920.yml b/html/changelogs/AutoChangeLog-pr-9920.yml
deleted file mode 100644
index 68e336f042..0000000000
--- a/html/changelogs/AutoChangeLog-pr-9920.yml
+++ /dev/null
@@ -1,4 +0,0 @@
-author: "YakumoChen"
-delete-after: True
-changes:
- - imageadd: "New AI Holograms and Displays! Ported from /vg/station."
diff --git a/html/changelogs/AutoChangeLog-pr-9922.yml b/html/changelogs/AutoChangeLog-pr-9922.yml
deleted file mode 100644
index 3c293c742c..0000000000
--- a/html/changelogs/AutoChangeLog-pr-9922.yml
+++ /dev/null
@@ -1,6 +0,0 @@
-author: "GrayRachnid"
-delete-after: True
-changes:
- - rscadd: "Added traumas"
- - rscadd: "Added science powergame tool"
- - tweak: "a few hearing args"
diff --git a/html/changelogs/AutoChangeLog-pr-9925.yml b/html/changelogs/AutoChangeLog-pr-9925.yml
new file mode 100644
index 0000000000..6e2f44fc7b
--- /dev/null
+++ b/html/changelogs/AutoChangeLog-pr-9925.yml
@@ -0,0 +1,4 @@
+author: "Linzolle"
+delete-after: True
+changes:
+ - tweak: "cosmic coat crafting recipe changed to coat + cosmic bedsheet"
diff --git a/html/changelogs/AutoChangeLog-pr-9940.yml b/html/changelogs/AutoChangeLog-pr-9940.yml
new file mode 100644
index 0000000000..75563c69b4
--- /dev/null
+++ b/html/changelogs/AutoChangeLog-pr-9940.yml
@@ -0,0 +1,4 @@
+author: "Putnam"
+delete-after: True
+changes:
+ - tweak: "Dynamic rulesets have lower weight if a round recently featured them (except traitor)."
diff --git a/html/changelogs/AutoChangeLog-pr-9941.yml b/html/changelogs/AutoChangeLog-pr-9941.yml
deleted file mode 100644
index f7f011f38e..0000000000
--- a/html/changelogs/AutoChangeLog-pr-9941.yml
+++ /dev/null
@@ -1,4 +0,0 @@
-author: "Putnam"
-delete-after: True
-changes:
- - bugfix: "Personal closets can use anything that holds an ID card now."
diff --git a/html/changelogs/AutoChangeLog-pr-9942.yml b/html/changelogs/AutoChangeLog-pr-9942.yml
deleted file mode 100644
index 3b6925289b..0000000000
--- a/html/changelogs/AutoChangeLog-pr-9942.yml
+++ /dev/null
@@ -1,4 +0,0 @@
-author: "Useroth"
-delete-after: True
-changes:
- - bugfix: "the new plants now properly get their reagents and reagent genes instead of being empty with UNKNOWN reagents listed in the DNA machine"
diff --git a/html/changelogs/AutoChangeLog-pr-9943.yml b/html/changelogs/AutoChangeLog-pr-9943.yml
deleted file mode 100644
index 8164ff2701..0000000000
--- a/html/changelogs/AutoChangeLog-pr-9943.yml
+++ /dev/null
@@ -1,5 +0,0 @@
-author: "dapnee"
-delete-after: True
-changes:
- - bugfix: "Communications console window no longer updates, won't steal focus anymore."
- - bugfix: "Trimline neutral end exists now."
diff --git a/html/changelogs/AutoChangeLog-pr-9946.yml b/html/changelogs/AutoChangeLog-pr-9946.yml
deleted file mode 100644
index e045c5006f..0000000000
--- a/html/changelogs/AutoChangeLog-pr-9946.yml
+++ /dev/null
@@ -1,4 +0,0 @@
-author: "kevinz000"
-delete-after: True
-changes:
- - balance: "Light pink extracts no longer speed you up. Instead, they give stamina regeneration and free sprinting."
diff --git a/html/changelogs/AutoChangeLog-pr-9947.yml b/html/changelogs/AutoChangeLog-pr-9947.yml
deleted file mode 100644
index 0ade316470..0000000000
--- a/html/changelogs/AutoChangeLog-pr-9947.yml
+++ /dev/null
@@ -1,4 +0,0 @@
-author: "Iroquois-Pliskin"
-delete-after: True
-changes:
- - rscdel: "Removed Clockwork Cult Surgical facility from Reebe"
diff --git a/html/changelogs/AutoChangeLog-pr-9948.yml b/html/changelogs/AutoChangeLog-pr-9948.yml
deleted file mode 100644
index 4f337660be..0000000000
--- a/html/changelogs/AutoChangeLog-pr-9948.yml
+++ /dev/null
@@ -1,4 +0,0 @@
-author: "Ghommie"
-delete-after: True
-changes:
- - bugfix: "Morgues' original alert beeping sound has been restored, they no longer go \"ammunition depleted\""
diff --git a/html/changelogs/AutoChangeLog-pr-9950.yml b/html/changelogs/AutoChangeLog-pr-9950.yml
new file mode 100644
index 0000000000..6d328aa131
--- /dev/null
+++ b/html/changelogs/AutoChangeLog-pr-9950.yml
@@ -0,0 +1,4 @@
+author: "kevinz000"
+delete-after: True
+changes:
+ - balance: "Clockwork marauders are now on a configured summon cooldown if being summoned on station. They also rapidly bleed health while in or next to space. And they glow brighter."
diff --git a/html/changelogs/AutoChangeLog-pr-9955.yml b/html/changelogs/AutoChangeLog-pr-9955.yml
deleted file mode 100644
index 3bd30ca6ee..0000000000
--- a/html/changelogs/AutoChangeLog-pr-9955.yml
+++ /dev/null
@@ -1,19 +0,0 @@
-author: "Ghommie, porting lot of PRs by MrDoomBringer, AnturK, nemvar and coiax."
-delete-after: True
-changes:
- - admin: "Admins can now launch supplypods the old, slightly quicker way as well"
- - bugfix: "Centcom-launched supplypods will now properly delimb you (if they are designated to do so) instead of touching you then literally yeeting all of your internal organs out of your body."
- - admin: "Centcom can now specify if they want to yeet all of your organs out of your body with a supplypod"
- - soundadd: "Supplypods sound a bit nicer as the land now."
- - admin: "admins can now adjust the animation duration for centcom-launched supplypods"
- - admin: "admins can adjust any sounds that are played as the supplypod lands"
- - bugfix: "Reverse-Supplypods (the admin-launched ones) no longer stay behind after rising up, and also auto-delete from centcom."
- - admin: "The centcom podlauncher now has better logging"
- - tweak: "Admins can now allow ghosts to follow the delivery of Centcom-launched supply pods"
- - admin: "Admins can now use the Centcom Podlauncher to launch things without the things looking like they're being sent inside a pod."
- - admin: "sparks will not generate if the quietLanding effect is on, for the centcom podlauncher"
- - admin: "makes input text clearer for the centcom podlauncher"
- - admin: "New 'Podspawn' verb, which functions like 'Spawn', except
-any atoms movable spawned will be dropped in via a no-damage, no-explosion
-Centcom supply pod."
- - bugfix: "Removed an oversight that made many obj/effect subtypes accidentally bombproof."
diff --git a/html/changelogs/AutoChangeLog-pr-9957.yml b/html/changelogs/AutoChangeLog-pr-9957.yml
deleted file mode 100644
index 234fecdf79..0000000000
--- a/html/changelogs/AutoChangeLog-pr-9957.yml
+++ /dev/null
@@ -1,4 +0,0 @@
-author: "Ghommie"
-delete-after: True
-changes:
- - bugfix: "Fixed missing hypereutactic left inhand sprites."
diff --git a/html/changelogs/AutoChangeLog-pr-9959.yml b/html/changelogs/AutoChangeLog-pr-9959.yml
deleted file mode 100644
index e222659096..0000000000
--- a/html/changelogs/AutoChangeLog-pr-9959.yml
+++ /dev/null
@@ -1,5 +0,0 @@
-author: "Ghommie"
-delete-after: True
-changes:
- - bugfix: "Dying, ghosting, having your mind / ckey transferred to another mob, going softcrit or otherwise unconscious now properly turn off combat mode."
- - bugfix: "combat mode can't be toggled on while non fully conscious anymore."
diff --git a/html/changelogs/AutoChangeLog-pr-9960.yml b/html/changelogs/AutoChangeLog-pr-9960.yml
deleted file mode 100644
index d6701d7eb4..0000000000
--- a/html/changelogs/AutoChangeLog-pr-9960.yml
+++ /dev/null
@@ -1,6 +0,0 @@
-author: "Krysonism, Ghommie"
-delete-after: True
-changes:
- - rscadd: "NT has made breakthroughs in ice cream science, ice creams can now be flavoured with any reagent!"
- - tweak: "The ice cream vat now accepts beakers."
- - bugfix: "Grape and Peach icecreams have scoop overlays yet again."
diff --git a/html/changelogs/AutoChangeLog-pr-9962.yml b/html/changelogs/AutoChangeLog-pr-9962.yml
deleted file mode 100644
index d1ac38193f..0000000000
--- a/html/changelogs/AutoChangeLog-pr-9962.yml
+++ /dev/null
@@ -1,4 +0,0 @@
-author: "Ghommie"
-delete-after: True
-changes:
- - bugfix: "Fixed limbs' set_disabled NOT dropping your held items, updating your hand slot inventory screen image, prompting chat messages and making your character scream like a sissy."
diff --git a/html/changelogs/AutoChangeLog-pr-9965.yml b/html/changelogs/AutoChangeLog-pr-9965.yml
deleted file mode 100644
index 6a7562aa46..0000000000
--- a/html/changelogs/AutoChangeLog-pr-9965.yml
+++ /dev/null
@@ -1,4 +0,0 @@
-author: "GrayRachnid"
-delete-after: True
-changes:
- - tweak: "tweaked the number of ingredients/pancakes you can stack."
diff --git a/html/changelogs/AutoChangeLog-pr-9966.yml b/html/changelogs/AutoChangeLog-pr-9966.yml
deleted file mode 100644
index 2b4a027949..0000000000
--- a/html/changelogs/AutoChangeLog-pr-9966.yml
+++ /dev/null
@@ -1,4 +0,0 @@
-author: "Ghommie"
-delete-after: True
-changes:
- - bugfix: "Lusty xenomoprh maids will now actually clean tiles they travel onto yet again."
diff --git a/html/changelogs/AutoChangeLog-pr-9967.yml b/html/changelogs/AutoChangeLog-pr-9967.yml
deleted file mode 100644
index 8d9448d290..0000000000
--- a/html/changelogs/AutoChangeLog-pr-9967.yml
+++ /dev/null
@@ -1,4 +0,0 @@
-author: "Mickyy5"
-delete-after: True
-changes:
- - rscadd: "Nanotrasen are now issuing Plasmamen with plasma in their survival boxes"
diff --git a/html/changelogs/AutoChangeLog-pr-9969.yml b/html/changelogs/AutoChangeLog-pr-9969.yml
deleted file mode 100644
index 2aac34acd4..0000000000
--- a/html/changelogs/AutoChangeLog-pr-9969.yml
+++ /dev/null
@@ -1,4 +0,0 @@
-author: "Linzolle"
-delete-after: True
-changes:
- - tweak: "hat tossing can no longer knock hats off"
diff --git a/html/changelogs/AutoChangeLog-pr-9970.yml b/html/changelogs/AutoChangeLog-pr-9970.yml
new file mode 100644
index 0000000000..ebeaa326e7
--- /dev/null
+++ b/html/changelogs/AutoChangeLog-pr-9970.yml
@@ -0,0 +1,4 @@
+author: "Ghommie"
+delete-after: True
+changes:
+ - rscdel: "Removed literally atrocious polka dotted accessories. They were even more atrocious than the yellow horrible tie."
diff --git a/html/changelogs/AutoChangeLog-pr-9971.yml b/html/changelogs/AutoChangeLog-pr-9971.yml
new file mode 100644
index 0000000000..951b9dfc81
--- /dev/null
+++ b/html/changelogs/AutoChangeLog-pr-9971.yml
@@ -0,0 +1,8 @@
+author: "Xantholne"
+delete-after: True
+changes:
+ - rscadd: "Santa Hats to Loadout and Clothesmate"
+ - rscadd: "Christmas Wintercoats to Loadout and Clothesmate"
+ - rscadd: "Christmas male and female uniforms to loadout and Clothesmate"
+ - rscadd: "Red, Green, and Traditional Santa boots to loadout and Clothesmate"
+ - rscadd: "Christmas Socks, Red candycane socks, Green candycane socks to sock selection"
diff --git a/html/changelogs/AutoChangeLog-pr-9972.yml b/html/changelogs/AutoChangeLog-pr-9972.yml
deleted file mode 100644
index ab9047a1ce..0000000000
--- a/html/changelogs/AutoChangeLog-pr-9972.yml
+++ /dev/null
@@ -1,4 +0,0 @@
-author: "Ghommie"
-delete-after: True
-changes:
- - bugfix: "Fixed double whitespace gap in human and AI examine. Fixed single whitespace in carbon examine."
diff --git a/html/changelogs/AutoChangeLog-pr-9975.yml b/html/changelogs/AutoChangeLog-pr-9975.yml
deleted file mode 100644
index ea0ca116b5..0000000000
--- a/html/changelogs/AutoChangeLog-pr-9975.yml
+++ /dev/null
@@ -1,6 +0,0 @@
-author: "Ghommie"
-delete-after: True
-changes:
- - rscdel: "Removed a few useless supply packs: \"Siezed\" power cells, means of production and promiscous organs."
- - tweak: "Merged the synthetic blood supply pack into the standard blood supply pack, effectively removing a random type blood pack in favor of two synthetic ones."
- - tweak: "Merged together premium carpet pack n°1 and n°2 to hold one of each standard pattern."
diff --git a/html/changelogs/AutoChangeLog-pr-9976.yml b/html/changelogs/AutoChangeLog-pr-9976.yml
deleted file mode 100644
index 3db57e2c5a..0000000000
--- a/html/changelogs/AutoChangeLog-pr-9976.yml
+++ /dev/null
@@ -1,4 +0,0 @@
-author: "Coconutwarrior97"
-delete-after: True
-changes:
- - bugfix: "Can only wrench down two transit tubes per turf."
diff --git a/html/changelogs/AutoChangeLog-pr-9977.yml b/html/changelogs/AutoChangeLog-pr-9977.yml
deleted file mode 100644
index 8a4d2dc304..0000000000
--- a/html/changelogs/AutoChangeLog-pr-9977.yml
+++ /dev/null
@@ -1,5 +0,0 @@
-author: "Useroth"
-delete-after: True
-changes:
- - rscadd: "extradimensional oranges now contain haloperidol"
- - bugfix: "extradimensional oranges now actually grow properly and give proper seeds."
diff --git a/html/changelogs/AutoChangeLog-pr-9980.yml b/html/changelogs/AutoChangeLog-pr-9980.yml
deleted file mode 100644
index b5deb45f2d..0000000000
--- a/html/changelogs/AutoChangeLog-pr-9980.yml
+++ /dev/null
@@ -1,4 +0,0 @@
-author: "Tetr4"
-delete-after: True
-changes:
- - bugfix: "Turning a tile with gas effects into space now gets rid of the effects."
diff --git a/html/changelogs/AutoChangeLog-pr-9981.yml b/html/changelogs/AutoChangeLog-pr-9981.yml
deleted file mode 100644
index cd7957df0f..0000000000
--- a/html/changelogs/AutoChangeLog-pr-9981.yml
+++ /dev/null
@@ -1,5 +0,0 @@
-author: "Ghommie"
-delete-after: True
-changes:
- - tweak: "You can no longer estimate the amount of reagents found inside a damp rag."
- - tweak: "You can now squeeze a rag's reagents into another open container, as long as the other one is not full."
diff --git a/html/changelogs/AutoChangeLog-pr-9983.yml b/html/changelogs/AutoChangeLog-pr-9983.yml
new file mode 100644
index 0000000000..b8cd4f0f5b
--- /dev/null
+++ b/html/changelogs/AutoChangeLog-pr-9983.yml
@@ -0,0 +1,6 @@
+author: "Ghommie, Skogol"
+delete-after: True
+changes:
+ - refactor: "refactored altclick interaction to allow alt-click interactable objects to parent call without forcing the turf contents stat menu open."
+ - tweak: "Alt clicking will no longer show turf contents for items inside bags etc."
+ - tweak: "Alt clicking the source of your turf contents stat menu will now close said menu."
diff --git a/html/changelogs/AutoChangeLog-pr-9988.yml b/html/changelogs/AutoChangeLog-pr-9988.yml
deleted file mode 100644
index 7fb1c5c6d8..0000000000
--- a/html/changelogs/AutoChangeLog-pr-9988.yml
+++ /dev/null
@@ -1,4 +0,0 @@
-author: "Ghommie"
-delete-after: True
-changes:
- - bugfix: "Fixed ED-209 being unbuildable past the welding step."
diff --git a/html/changelogs/AutoChangeLog-pr-9989.yml b/html/changelogs/AutoChangeLog-pr-9989.yml
deleted file mode 100644
index 6e19e7eb5e..0000000000
--- a/html/changelogs/AutoChangeLog-pr-9989.yml
+++ /dev/null
@@ -1,4 +0,0 @@
-author: "ShizCalev"
-delete-after: True
-changes:
- - bugfix: "Fixed a couple of laser / energy guns never switching to the empty icon despite being unable to fire."
diff --git a/html/changelogs/AutoChangeLog-pr-9990.yml b/html/changelogs/AutoChangeLog-pr-9990.yml
deleted file mode 100644
index 1e3de0164c..0000000000
--- a/html/changelogs/AutoChangeLog-pr-9990.yml
+++ /dev/null
@@ -1,5 +0,0 @@
-author: "Linzolle"
-delete-after: True
-changes:
- - bugfix: "strange reagent being unable to revive simplemobs"
- - rscadd: "jitter animation and more clear text to strange reagent revival"
diff --git a/html/changelogs/AutoChangeLog-pr-9992.yml b/html/changelogs/AutoChangeLog-pr-9992.yml
deleted file mode 100644
index fb59893d34..0000000000
--- a/html/changelogs/AutoChangeLog-pr-9992.yml
+++ /dev/null
@@ -1,4 +0,0 @@
-author: "Ghommie"
-delete-after: True
-changes:
- - bugfix: "Fixed ai displays status being reset to \"Neutral\" on login, regardless of choice."
diff --git a/html/changelogs/AutoChangeLog-pr-9993.yml b/html/changelogs/AutoChangeLog-pr-9993.yml
deleted file mode 100644
index 980d82bbdc..0000000000
--- a/html/changelogs/AutoChangeLog-pr-9993.yml
+++ /dev/null
@@ -1,8 +0,0 @@
-author: "nemvar, ShizCalev, Qustinnus/Floyd, Ghommie"
-delete-after: True
-changes:
- - rscadd: "You can now unfasten the loom."
- - tweak: "it now takes 4 strands to make one piece of durathread cloth"
- - bugfix: "Looms can now be attacked."
- - rscadd: "Durathread golem weaves his magic"
- - tweak: "Supply ordered looms are unanchored. Bring a wrench."
diff --git a/html/changelogs/AutoChangeLog-pr-9996.yml b/html/changelogs/AutoChangeLog-pr-9996.yml
deleted file mode 100644
index 1562cfd766..0000000000
--- a/html/changelogs/AutoChangeLog-pr-9996.yml
+++ /dev/null
@@ -1,4 +0,0 @@
-author: "Ghommie"
-delete-after: True
-changes:
- - bugfix: "Fixed tinfoil hats giving random traumas."
diff --git a/icons/effects/96x96.dmi b/icons/effects/96x96.dmi
index a9f20ae8a8..c0b5ef5b40 100644
Binary files a/icons/effects/96x96.dmi and b/icons/effects/96x96.dmi differ
diff --git a/icons/misc/language.dmi b/icons/misc/language.dmi
index dcd10a51b7..6f6f2546d5 100644
Binary files a/icons/misc/language.dmi and b/icons/misc/language.dmi differ
diff --git a/icons/misc/mark_icons.dmi b/icons/misc/mark_icons.dmi
new file mode 100644
index 0000000000..1d8472752b
Binary files /dev/null and b/icons/misc/mark_icons.dmi differ
diff --git a/icons/mob/accessories.dmi b/icons/mob/accessories.dmi
index 33964645ee..cda7cca404 100644
Binary files a/icons/mob/accessories.dmi and b/icons/mob/accessories.dmi differ
diff --git a/icons/mob/actions/actions_elites.dmi b/icons/mob/actions/actions_elites.dmi
new file mode 100644
index 0000000000..335261b0f6
Binary files /dev/null and b/icons/mob/actions/actions_elites.dmi differ
diff --git a/icons/mob/actions/actions_spells.dmi b/icons/mob/actions/actions_spells.dmi
index 30927d3608..072bfc8fe3 100644
Binary files a/icons/mob/actions/actions_spells.dmi and b/icons/mob/actions/actions_spells.dmi differ
diff --git a/icons/mob/actions/bloodsucker.dmi b/icons/mob/actions/bloodsucker.dmi
new file mode 100644
index 0000000000..c08509dbbd
Binary files /dev/null and b/icons/mob/actions/bloodsucker.dmi differ
diff --git a/icons/mob/animals_held.dmi b/icons/mob/animals_held.dmi
new file mode 100644
index 0000000000..82a065d93a
Binary files /dev/null and b/icons/mob/animals_held.dmi differ
diff --git a/icons/mob/animals_held_lh.dmi b/icons/mob/animals_held_lh.dmi
new file mode 100644
index 0000000000..6c407c850b
Binary files /dev/null and b/icons/mob/animals_held_lh.dmi differ
diff --git a/icons/mob/animals_held_rh.dmi b/icons/mob/animals_held_rh.dmi
new file mode 100644
index 0000000000..322dad06d2
Binary files /dev/null and b/icons/mob/animals_held_rh.dmi differ
diff --git a/icons/mob/custom_w.dmi b/icons/mob/custom_w.dmi
index b572338fc6..a73da3aa0c 100644
Binary files a/icons/mob/custom_w.dmi and b/icons/mob/custom_w.dmi differ
diff --git a/icons/mob/feet.dmi b/icons/mob/feet.dmi
index c57a7cc112..2188952740 100644
Binary files a/icons/mob/feet.dmi and b/icons/mob/feet.dmi differ
diff --git a/icons/mob/feet_digi.dmi b/icons/mob/feet_digi.dmi
index a8e6c49423..e0a9cd462d 100644
Binary files a/icons/mob/feet_digi.dmi and b/icons/mob/feet_digi.dmi differ
diff --git a/icons/mob/head.dmi b/icons/mob/head.dmi
index d27e02a4f2..365ed5afd9 100644
Binary files a/icons/mob/head.dmi and b/icons/mob/head.dmi differ
diff --git a/icons/mob/hud.dmi b/icons/mob/hud.dmi
index d2b67f4314..8ea155256c 100644
Binary files a/icons/mob/hud.dmi and b/icons/mob/hud.dmi differ
diff --git a/icons/mob/human_face.dmi b/icons/mob/human_face.dmi
index 9540599364..772a263358 100644
Binary files a/icons/mob/human_face.dmi and b/icons/mob/human_face.dmi differ
diff --git a/icons/mob/inhands/equipment/idcards_lefthand.dmi b/icons/mob/inhands/equipment/idcards_lefthand.dmi
index 53b40584e7..dd7f6fbbe2 100644
Binary files a/icons/mob/inhands/equipment/idcards_lefthand.dmi and b/icons/mob/inhands/equipment/idcards_lefthand.dmi differ
diff --git a/icons/mob/inhands/equipment/idcards_righthand.dmi b/icons/mob/inhands/equipment/idcards_righthand.dmi
index 19a6f77c28..a7483ca2eb 100644
Binary files a/icons/mob/inhands/equipment/idcards_righthand.dmi and b/icons/mob/inhands/equipment/idcards_righthand.dmi differ
diff --git a/icons/mob/inhands/weapons/guns_lefthand.dmi b/icons/mob/inhands/weapons/guns_lefthand.dmi
index 8978d17237..a166610826 100644
Binary files a/icons/mob/inhands/weapons/guns_lefthand.dmi and b/icons/mob/inhands/weapons/guns_lefthand.dmi differ
diff --git a/icons/mob/inhands/weapons/guns_righthand.dmi b/icons/mob/inhands/weapons/guns_righthand.dmi
index 3f8a876d43..47ed1adfee 100644
Binary files a/icons/mob/inhands/weapons/guns_righthand.dmi and b/icons/mob/inhands/weapons/guns_righthand.dmi differ
diff --git a/icons/mob/inhands/weapons/melee_lefthand.dmi b/icons/mob/inhands/weapons/melee_lefthand.dmi
index 092881ee01..fc82db43ae 100644
Binary files a/icons/mob/inhands/weapons/melee_lefthand.dmi and b/icons/mob/inhands/weapons/melee_lefthand.dmi differ
diff --git a/icons/mob/inhands/weapons/melee_righthand.dmi b/icons/mob/inhands/weapons/melee_righthand.dmi
index ede430390c..a93a4e38d5 100644
Binary files a/icons/mob/inhands/weapons/melee_righthand.dmi and b/icons/mob/inhands/weapons/melee_righthand.dmi differ
diff --git a/icons/mob/insect_markings.dmi b/icons/mob/insect_markings.dmi
new file mode 100644
index 0000000000..6aea140271
Binary files /dev/null and b/icons/mob/insect_markings.dmi differ
diff --git a/icons/mob/lavaland/lavaland_elites.dmi b/icons/mob/lavaland/lavaland_elites.dmi
new file mode 100644
index 0000000000..69032735d9
Binary files /dev/null and b/icons/mob/lavaland/lavaland_elites.dmi differ
diff --git a/icons/mob/neck.dmi b/icons/mob/neck.dmi
index 5eb270d23f..de59a136d9 100644
Binary files a/icons/mob/neck.dmi and b/icons/mob/neck.dmi differ
diff --git a/icons/mob/screen_alert.dmi b/icons/mob/screen_alert.dmi
index 30b8eb8f9a..c1912d74cc 100644
Binary files a/icons/mob/screen_alert.dmi and b/icons/mob/screen_alert.dmi differ
diff --git a/icons/mob/screen_elite.dmi b/icons/mob/screen_elite.dmi
new file mode 100644
index 0000000000..f407fb79e4
Binary files /dev/null and b/icons/mob/screen_elite.dmi differ
diff --git a/icons/mob/suit.dmi b/icons/mob/suit.dmi
index 61168860d8..5b84dad999 100644
Binary files a/icons/mob/suit.dmi and b/icons/mob/suit.dmi differ
diff --git a/icons/mob/underwear.dmi b/icons/mob/underwear.dmi
index 3174397b54..bf0df371eb 100644
Binary files a/icons/mob/underwear.dmi and b/icons/mob/underwear.dmi differ
diff --git a/icons/mob/uniform.dmi b/icons/mob/uniform.dmi
index 1141c4b8c9..c5981b06a3 100644
Binary files a/icons/mob/uniform.dmi and b/icons/mob/uniform.dmi differ
diff --git a/icons/mob/uniform_digi.dmi b/icons/mob/uniform_digi.dmi
index 3f1335153e..b4f3e6130b 100644
Binary files a/icons/mob/uniform_digi.dmi and b/icons/mob/uniform_digi.dmi differ
diff --git a/icons/mob/wings.dmi b/icons/mob/wings.dmi
index 7d95805dc5..ace37b1f17 100644
Binary files a/icons/mob/wings.dmi and b/icons/mob/wings.dmi differ
diff --git a/icons/obj/abductor.dmi b/icons/obj/abductor.dmi
index d8968a107b..fd0893b300 100644
Binary files a/icons/obj/abductor.dmi and b/icons/obj/abductor.dmi differ
diff --git a/icons/obj/clothing/accessories.dmi b/icons/obj/clothing/accessories.dmi
index eb019bc44b..c62a88c829 100644
Binary files a/icons/obj/clothing/accessories.dmi and b/icons/obj/clothing/accessories.dmi differ
diff --git a/icons/obj/clothing/hats.dmi b/icons/obj/clothing/hats.dmi
index c6b261d9a2..b3cc31fc6d 100644
Binary files a/icons/obj/clothing/hats.dmi and b/icons/obj/clothing/hats.dmi differ
diff --git a/icons/obj/clothing/shoes.dmi b/icons/obj/clothing/shoes.dmi
index e3a9f6d84e..728d244b5f 100644
Binary files a/icons/obj/clothing/shoes.dmi and b/icons/obj/clothing/shoes.dmi differ
diff --git a/icons/obj/clothing/uniforms.dmi b/icons/obj/clothing/uniforms.dmi
index a980fd4177..60753839d2 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 bbb813d7c9..d0be1113ee 100644
Binary files a/icons/obj/custom.dmi and b/icons/obj/custom.dmi differ
diff --git a/icons/obj/drinks.dmi b/icons/obj/drinks.dmi
index ac898c55b2..b03a1cdeae 100644
Binary files a/icons/obj/drinks.dmi and b/icons/obj/drinks.dmi differ
diff --git a/icons/obj/food/burgerbread.dmi b/icons/obj/food/burgerbread.dmi
index cd7fc1742b..b1d78fa078 100644
Binary files a/icons/obj/food/burgerbread.dmi and b/icons/obj/food/burgerbread.dmi differ
diff --git a/icons/obj/food/donut.dmi b/icons/obj/food/donut.dmi
new file mode 100644
index 0000000000..fb13ab5dfa
Binary files /dev/null and b/icons/obj/food/donut.dmi differ
diff --git a/icons/obj/food/food.dmi b/icons/obj/food/food.dmi
index 2ea48828d2..6b29d599cc 100644
Binary files a/icons/obj/food/food.dmi and b/icons/obj/food/food.dmi differ
diff --git a/icons/obj/food/piecake.dmi b/icons/obj/food/piecake.dmi
index a74acb4e29..5638235217 100644
Binary files a/icons/obj/food/piecake.dmi and b/icons/obj/food/piecake.dmi differ
diff --git a/icons/obj/food/snowcones.dmi b/icons/obj/food/snowcones.dmi
index 8a06cf4e82..8f5b4f8992 100644
Binary files a/icons/obj/food/snowcones.dmi and b/icons/obj/food/snowcones.dmi differ
diff --git a/icons/obj/food/soupsalad.dmi b/icons/obj/food/soupsalad.dmi
index c6df0a2603..a6e492608f 100644
Binary files a/icons/obj/food/soupsalad.dmi and b/icons/obj/food/soupsalad.dmi differ
diff --git a/icons/obj/guns/energy.dmi b/icons/obj/guns/energy.dmi
index d23af6c9b4..bba3efc951 100644
Binary files a/icons/obj/guns/energy.dmi and b/icons/obj/guns/energy.dmi differ
diff --git a/icons/obj/guns/projectile.dmi b/icons/obj/guns/projectile.dmi
index 6d5365f7fa..24ec5797d4 100644
Binary files a/icons/obj/guns/projectile.dmi and b/icons/obj/guns/projectile.dmi differ
diff --git a/icons/obj/hydroponics/equipment.dmi b/icons/obj/hydroponics/equipment.dmi
index dd4d1e1f93..37adf54711 100644
Binary files a/icons/obj/hydroponics/equipment.dmi and b/icons/obj/hydroponics/equipment.dmi differ
diff --git a/icons/obj/hydroponics/growing.dmi b/icons/obj/hydroponics/growing.dmi
index 45e73c9281..469b1e1aff 100644
Binary files a/icons/obj/hydroponics/growing.dmi and b/icons/obj/hydroponics/growing.dmi differ
diff --git a/icons/obj/hydroponics/harvest.dmi b/icons/obj/hydroponics/harvest.dmi
index 9d4eefc3bb..a57719fb3a 100644
Binary files a/icons/obj/hydroponics/harvest.dmi and b/icons/obj/hydroponics/harvest.dmi differ
diff --git a/icons/obj/hydroponics/seeds.dmi b/icons/obj/hydroponics/seeds.dmi
index d8fcaa6258..8695d03b3c 100644
Binary files a/icons/obj/hydroponics/seeds.dmi and b/icons/obj/hydroponics/seeds.dmi differ
diff --git a/icons/obj/items_and_weapons.dmi b/icons/obj/items_and_weapons.dmi
index e6e0b940a8..e3540a782b 100644
Binary files a/icons/obj/items_and_weapons.dmi and b/icons/obj/items_and_weapons.dmi differ
diff --git a/icons/obj/janitor.dmi b/icons/obj/janitor.dmi
index 1e1033e38e..4886cb8441 100644
Binary files a/icons/obj/janitor.dmi and b/icons/obj/janitor.dmi differ
diff --git a/icons/obj/kitchen.dmi b/icons/obj/kitchen.dmi
index e41d1fb4a1..cb67f0d6f9 100644
Binary files a/icons/obj/kitchen.dmi and b/icons/obj/kitchen.dmi differ
diff --git a/icons/obj/lavaland/artefacts.dmi b/icons/obj/lavaland/artefacts.dmi
index 7f11ba29d4..7ae1ed5a0e 100644
Binary files a/icons/obj/lavaland/artefacts.dmi and b/icons/obj/lavaland/artefacts.dmi differ
diff --git a/icons/obj/lavaland/elite_trophies.dmi b/icons/obj/lavaland/elite_trophies.dmi
new file mode 100644
index 0000000000..d194c93853
Binary files /dev/null and b/icons/obj/lavaland/elite_trophies.dmi differ
diff --git a/icons/obj/lavaland/legionnaire_bonfire.dmi b/icons/obj/lavaland/legionnaire_bonfire.dmi
new file mode 100644
index 0000000000..aed00ed001
Binary files /dev/null and b/icons/obj/lavaland/legionnaire_bonfire.dmi differ
diff --git a/icons/obj/lavaland/tumor.dmi b/icons/obj/lavaland/tumor.dmi
new file mode 100644
index 0000000000..a41224c823
Binary files /dev/null and b/icons/obj/lavaland/tumor.dmi differ
diff --git a/icons/obj/library.dmi b/icons/obj/library.dmi
index 20e0f5f73c..45181b7c8d 100644
Binary files a/icons/obj/library.dmi and b/icons/obj/library.dmi differ
diff --git a/icons/obj/module.dmi b/icons/obj/module.dmi
index 037525150e..ace24db5ff 100644
Binary files a/icons/obj/module.dmi and b/icons/obj/module.dmi differ
diff --git a/icons/obj/monitors.dmi b/icons/obj/monitors.dmi
index e38760b84d..93a1908fba 100644
Binary files a/icons/obj/monitors.dmi and b/icons/obj/monitors.dmi differ
diff --git a/icons/obj/projectiles.dmi b/icons/obj/projectiles.dmi
index ad1d34836d..a434994846 100644
Binary files a/icons/obj/projectiles.dmi and b/icons/obj/projectiles.dmi differ
diff --git a/icons/obj/projectiles_impact.dmi b/icons/obj/projectiles_impact.dmi
index bac35e68e1..5506f6f866 100644
Binary files a/icons/obj/projectiles_impact.dmi and b/icons/obj/projectiles_impact.dmi differ
diff --git a/icons/obj/projectiles_muzzle.dmi b/icons/obj/projectiles_muzzle.dmi
index 2f1d6d90c6..884605c373 100644
Binary files a/icons/obj/projectiles_muzzle.dmi and b/icons/obj/projectiles_muzzle.dmi differ
diff --git a/icons/obj/projectiles_tracer.dmi b/icons/obj/projectiles_tracer.dmi
index 56442452e7..34718d7066 100644
Binary files a/icons/obj/projectiles_tracer.dmi and b/icons/obj/projectiles_tracer.dmi differ
diff --git a/icons/obj/stack_objects.dmi b/icons/obj/stack_objects.dmi
index 7cb212384a..a80dc92b9a 100644
Binary files a/icons/obj/stack_objects.dmi and b/icons/obj/stack_objects.dmi differ
diff --git a/icons/obj/stake.dmi b/icons/obj/stake.dmi
new file mode 100644
index 0000000000..dfc1dc08bf
Binary files /dev/null and b/icons/obj/stake.dmi differ
diff --git a/icons/obj/vamp_obj.dmi b/icons/obj/vamp_obj.dmi
new file mode 100644
index 0000000000..89718773dd
Binary files /dev/null and b/icons/obj/vamp_obj.dmi differ
diff --git a/icons/obj/vending.dmi b/icons/obj/vending.dmi
index 553336115b..143171f414 100644
Binary files a/icons/obj/vending.dmi and b/icons/obj/vending.dmi differ
diff --git a/icons/rooms/box/engine.dmi b/icons/rooms/box/engine.dmi
new file mode 100644
index 0000000000..c7b0546db2
Binary files /dev/null and b/icons/rooms/box/engine.dmi differ
diff --git a/icons/turf/smoothrocks.dmi b/icons/turf/smoothrocks.dmi
index ba2bbce955..20314cff5b 100644
Binary files a/icons/turf/smoothrocks.dmi and b/icons/turf/smoothrocks.dmi differ
diff --git a/modular_citadel/code/datums/mutations/hulk.dm b/modular_citadel/code/datums/mutations/hulk.dm
deleted file mode 100644
index 601238707d..0000000000
--- a/modular_citadel/code/datums/mutations/hulk.dm
+++ /dev/null
@@ -1,2 +0,0 @@
-/datum/mutation/human/hulk
- species_allowed = list("fly")
\ No newline at end of file
diff --git a/modular_citadel/code/game/gamemodes/miniantags/bot_swarm/swarmer_event.dm b/modular_citadel/code/game/gamemodes/miniantags/bot_swarm/swarmer_event.dm
deleted file mode 100644
index 5dfe1dfcbd..0000000000
--- a/modular_citadel/code/game/gamemodes/miniantags/bot_swarm/swarmer_event.dm
+++ /dev/null
@@ -1,3 +0,0 @@
-/datum/round_event_control/spawn_swarmer
- weight = 0
- max_occurrences = 0
\ No newline at end of file
diff --git a/modular_citadel/code/game/gamemodes/revolution/revolution.dm b/modular_citadel/code/game/gamemodes/revolution/revolution.dm
deleted file mode 100644
index b377fc9fbd..0000000000
--- a/modular_citadel/code/game/gamemodes/revolution/revolution.dm
+++ /dev/null
@@ -1,5 +0,0 @@
-/datum/game_mode/revolution
- restricted_jobs = list("Security Officer", "Warden", "Detective", "AI", "Cyborg","Captain", "Head of Personnel", "Head of Security", "Chief Engineer", "Research Director", "Chief Medical Officer", "Quartermaster")
- false_report_weight = 10
- required_players = 20
- required_enemies = 1
diff --git a/modular_citadel/code/game/machinery/firealarm.dm b/modular_citadel/code/game/machinery/firealarm.dm
deleted file mode 100644
index 7c136f4e4d..0000000000
--- a/modular_citadel/code/game/machinery/firealarm.dm
+++ /dev/null
@@ -1,10 +0,0 @@
-/obj/machinery/firealarm/alt_attack_hand(mob/user)
- if(can_interact(usr))
- var/area/A = get_area(src)
- if(istype(A))
- if(A.fire)
- reset()
- else
- alarm()
- return TRUE
- return FALSE
diff --git a/modular_citadel/code/game/machinery/wishgranter.dm b/modular_citadel/code/game/machinery/wishgranter.dm
index f24062a126..48024a2228 100644
--- a/modular_citadel/code/game/machinery/wishgranter.dm
+++ b/modular_citadel/code/game/machinery/wishgranter.dm
@@ -63,7 +63,9 @@
to_chat(user, "Your wish is 'granted', but at a terrible cost...")
to_chat(user, "The Wish Granter punishes you for your selfishness, claiming your soul and warping your eyes to match the darkness in your heart.")
user.dna.add_mutation(BLINDMUT)
- user.adjust_eye_damage(100)
+ var/obj/item/organ/eyes/eyes = user.getorganslot(ORGAN_SLOT_EYES)
+ if(eyes)
+ eyes.applyOrganDamage(eyes.maxHealth)
var/list/destinations = list()
for(var/obj/item/beacon/B in GLOB.teleportbeacons)
var/turf/T = get_turf(B)
diff --git a/modular_citadel/code/game/objects/effects/temporary_visuals/projectiles/impact.dm b/modular_citadel/code/game/objects/effects/temporary_visuals/projectiles/impact.dm
deleted file mode 100644
index 20052c3351..0000000000
--- a/modular_citadel/code/game/objects/effects/temporary_visuals/projectiles/impact.dm
+++ /dev/null
@@ -1,4 +0,0 @@
-/obj/effect/projectile/impact/laser/wavemotion
- name = "particle impact"
- icon = 'modular_citadel/icons/obj/projectiles_impact.dmi'
- icon_state = "impact_wavemotion"
\ No newline at end of file
diff --git a/modular_citadel/code/game/objects/effects/temporary_visuals/projectiles/muzzle.dm b/modular_citadel/code/game/objects/effects/temporary_visuals/projectiles/muzzle.dm
deleted file mode 100644
index 5114cb223e..0000000000
--- a/modular_citadel/code/game/objects/effects/temporary_visuals/projectiles/muzzle.dm
+++ /dev/null
@@ -1,4 +0,0 @@
-/obj/effect/projectile/muzzle/laser/wavemotion
- name = "particle backblast"
- icon = 'modular_citadel/icons/obj/projectiles_muzzle.dmi'
- icon_state = "muzzle_wavemotion"
\ No newline at end of file
diff --git a/modular_citadel/code/game/objects/effects/temporary_visuals/projectiles/tracer.dm b/modular_citadel/code/game/objects/effects/temporary_visuals/projectiles/tracer.dm
deleted file mode 100644
index 8110fcabeb..0000000000
--- a/modular_citadel/code/game/objects/effects/temporary_visuals/projectiles/tracer.dm
+++ /dev/null
@@ -1,4 +0,0 @@
-/obj/effect/projectile/tracer/laser/wavemotion
- name = "particle trail"
- icon = 'modular_citadel/icons/obj/projectiles_tracer.dmi'
- icon_state = "tracer_wavemotion"
\ No newline at end of file
diff --git a/modular_citadel/code/modules/arousal/genitals.dm b/modular_citadel/code/modules/arousal/genitals.dm
index 9fa6d66d98..8d70464a2d 100644
--- a/modular_citadel/code/modules/arousal/genitals.dm
+++ b/modular_citadel/code/modules/arousal/genitals.dm
@@ -132,7 +132,7 @@
amount += 0.1
var/multiplier = fluid_mult
if(reagents.total_volume >= 5)
- multiplier *= 0.5
+ multiplier *= 0.8
if(reagents.total_volume < reagents.maximum_volume)
reagents.isolate_reagent(fluid_id)//remove old reagents if it changed and just clean up generally
reagents.add_reagent(fluid_id, (amount * multiplier))//generate the cum
diff --git a/modular_citadel/code/modules/arousal/organs/breasts.dm b/modular_citadel/code/modules/arousal/organs/breasts.dm
index a82d02703d..105f5e157d 100644
--- a/modular_citadel/code/modules/arousal/organs/breasts.dm
+++ b/modular_citadel/code/modules/arousal/organs/breasts.dm
@@ -7,6 +7,7 @@
slot = ORGAN_SLOT_BREASTS
size = "c" //refer to the breast_values static list below for the cups associated number values
fluid_id = "milk"
+ fluid_rate = MILK_RATE
shape = "pair"
genital_flags = CAN_MASTURBATE_WITH|CAN_CLIMAX_WITH|GENITAL_FUID_PRODUCTION
masturbation_verb = "massage"
@@ -63,7 +64,7 @@
//Allows breasts to grow and change size, with sprite changes too.
//maximum wah
//Comical sizes slow you down in movement and actions.
-//Rediculous sizes makes you more cumbersome.
+//Ridiculous sizes makes you more cumbersome.
//this is far too lewd wah
/obj/item/organ/genital/breasts/modify_size(modifier, min = -INFINITY, max = INFINITY)
@@ -119,7 +120,7 @@
shape = D.features["breasts_shape"]
fluid_id = D.features["breasts_fluid"]
if(!D.features["breasts_producing"])
- DISABLE_BITFIELD(genital_flags, GENITAL_FUID_PRODUCTION)
+ DISABLE_BITFIELD(genital_flags, GENITAL_FUID_PRODUCTION|CAN_CLIMAX_WITH|CAN_MASTURBATE_WITH)
if(!isnum(size))
cached_size = breast_values[size]
else
diff --git a/modular_citadel/code/modules/arousal/toys/dildos.dm b/modular_citadel/code/modules/arousal/toys/dildos.dm
index 24c8de1b60..964c9964ad 100644
--- a/modular_citadel/code/modules/arousal/toys/dildos.dm
+++ b/modular_citadel/code/modules/arousal/toys/dildos.dm
@@ -37,15 +37,11 @@
name = "[sizeword][dildo_shape] [can_customize ? "custom " : ""][dildo_type]"
/obj/item/dildo/AltClick(mob/living/user)
- if(QDELETED(src))
- return
- if(!isliving(user))
- return
- if(isAI(user))
- return
- if(user.stat > 0)//unconscious or dead
+ . = ..()
+ if(!istype(user) || !user.canUseTopic(src, BE_CLOSE, FALSE, NO_TK))
return
customize(user)
+ return TRUE
/obj/item/dildo/proc/customize(mob/living/user)
if(!can_customize)
@@ -150,7 +146,8 @@ obj/item/dildo/custom
playsound(loc, 'sound/weapons/gagging.ogg', 50, 1, -1)
user.Stun(150)
user.adjust_blurriness(8)
- user.adjust_eye_damage(10)
+ var/obj/item/organ/eyes/eyes = user.getorganslot(ORGAN_SLOT_EYES)
+ eyes?.applyOrganDamage(10)
return MANUAL_SUICIDE
/obj/item/dildo/flared/huge/suicide_act(mob/living/user)
@@ -159,6 +156,5 @@ obj/item/dildo/custom
playsound(loc, 'sound/weapons/gagging.ogg', 50, 2, -1)
user.Stun(300)
user.adjust_blurriness(8)
- user.adjust_eye_damage(15)
return MANUAL_SUICIDE
diff --git a/modular_citadel/code/modules/client/loadout/__donator.dm b/modular_citadel/code/modules/client/loadout/__donator.dm
index d75ffc2347..cf68666532 100644
--- a/modular_citadel/code/modules/client/loadout/__donator.dm
+++ b/modular_citadel/code/modules/client/loadout/__donator.dm
@@ -458,3 +458,33 @@ datum/gear/darksabresheath
category = SLOT_NECK
path = /obj/item/clothing/neck/necklace/onion
ckeywhitelist = list("cdrcross")
+
+/datum/gear/mikubikini
+ name = "starlight singer bikini"
+ category = SLOT_W_UNIFORM
+ path = /obj/item/clothing/under/mikubikini
+ ckeywhitelist = list("grandvegeta")
+
+/datum/gear/mikujacket
+ name = "starlight singer jacket"
+ category = SLOT_WEAR_SUIT
+ path = /obj/item/clothing/suit/mikujacket
+ ckeywhitelist = list("grandvegeta")
+
+/datum/gear/mikuhair
+ name = "starlight singer hair"
+ category = SLOT_W_UNIFORM
+ path = /obj/item/clothing/head/mikuhair
+ ckeywhitelist = list("grandvegeta")
+
+/datum/gear/mikugloves
+ name = "starlight singer gloves"
+ category = SLOT_GLOVES
+ path = /obj/item/clothing/gloves/mikugloves
+ ckeywhitelist = list("grandvegeta")
+
+/datum/gear/mikuleggings
+ name = "starlight singer leggings"
+ category = SLOT_SHOES
+ path = /obj/item/clothing/shoes/sneakers/mikuleggings
+ ckeywhitelist = list("grandvegeta")
diff --git a/modular_citadel/code/modules/client/loadout/head.dm b/modular_citadel/code/modules/client/loadout/head.dm
index 2d65f093bb..3e7eb39823 100644
--- a/modular_citadel/code/modules/client/loadout/head.dm
+++ b/modular_citadel/code/modules/client/loadout/head.dm
@@ -91,4 +91,14 @@
category = SLOT_HEAD
path = /obj/item/clothing/head/caphat/formal/fedcover/sec
restricted_desc = "Engineering, Security, and Cargo"
- restricted_roles = list("Chief Engineer","Atmospheric Technician","Station Engineer","Warden","Detective","Security Officer","Head of Security","Cargo Technician", "Shaft Miner", "Quartermaster")
\ No newline at end of file
+ restricted_roles = list("Chief Engineer","Atmospheric Technician","Station Engineer","Warden","Detective","Security Officer","Head of Security","Cargo Technician", "Shaft Miner", "Quartermaster")
+
+/datum/gear/santahatr
+ name = "Red Santa Hat"
+ category = SLOT_HEAD
+ path = /obj/item/clothing/head/christmashat
+
+/datum/gear/santahatg
+ name = "Green Santa Hat"
+ category = SLOT_HEAD
+ path = /obj/item/clothing/head/christmashatg
\ No newline at end of file
diff --git a/modular_citadel/code/modules/client/loadout/shoes.dm b/modular_citadel/code/modules/client/loadout/shoes.dm
index 6688529c73..7b3bee6638 100644
--- a/modular_citadel/code/modules/client/loadout/shoes.dm
+++ b/modular_citadel/code/modules/client/loadout/shoes.dm
@@ -56,4 +56,19 @@
/datum/gear/bluecuffs
name = "Blue leg wraps"
category = SLOT_SHOES
- path= /obj/item/clothing/shoes/wraps/blue
\ No newline at end of file
+ path= /obj/item/clothing/shoes/wraps/blue
+
+/datum/gear/christmasbootsr
+ name = "Red Christmas Boots"
+ category = SLOT_SHOES
+ path= /obj/item/clothing/shoes/winterboots/christmasbootsr
+
+/datum/gear/christmasbootsg
+ name = "Green Christmas Boots"
+ category = SLOT_SHOES
+ path= /obj/item/clothing/shoes/winterboots/christmasbootsg
+
+/datum/gear/santaboots
+ name = "Santa Boots"
+ category = SLOT_SHOES
+ path= /obj/item/clothing/shoes/winterboots/santaboots
\ No newline at end of file
diff --git a/modular_citadel/code/modules/client/loadout/suit.dm b/modular_citadel/code/modules/client/loadout/suit.dm
index 72387b622a..b8f3bd1cc1 100644
--- a/modular_citadel/code/modules/client/loadout/suit.dm
+++ b/modular_citadel/code/modules/client/loadout/suit.dm
@@ -204,3 +204,18 @@
path = /obj/item/clothing/suit/storage/fluff/modernfedcoat/eng
restricted_desc = "Engineering and Cargo"
restricted_roles = list("Chief Engineer","Atmospheric Technician","Station Engineer","Cargo Technician", "Shaft Miner", "Quartermaster")
+
+/datum/gear/christmascoatr
+ name = "Red Christmas Coat"
+ category = SLOT_WEAR_SUIT
+ path = /obj/item/clothing/suit/hooded/wintercoat/christmascoatr
+
+/datum/gear/christmascoatg
+ name = "Green Christmas Coat"
+ category = SLOT_WEAR_SUIT
+ path = /obj/item/clothing/suit/hooded/wintercoat/christmascoatg
+
+/datum/gear/christmascoatrg
+ name = "Red and Green Christmas Coat"
+ category = SLOT_WEAR_SUIT
+ path = /obj/item/clothing/suit/hooded/wintercoat/christmascoatrg
\ No newline at end of file
diff --git a/modular_citadel/code/modules/client/loadout/uniform.dm b/modular_citadel/code/modules/client/loadout/uniform.dm
index 232e37d921..72709069eb 100644
--- a/modular_citadel/code/modules/client/loadout/uniform.dm
+++ b/modular_citadel/code/modules/client/loadout/uniform.dm
@@ -330,6 +330,27 @@
category = SLOT_W_UNIFORM
path = /obj/item/clothing/under/gear_harness
+//Christmas
+/datum/gear/christmasmaler
+ name = "Red Masculine Christmas Suit"
+ category = SLOT_W_UNIFORM
+ path = /obj/item/clothing/under/christmas/christmasmaler
+
+/datum/gear/christmasmaleg
+ name = "Green Masculine Christmas Suit"
+ category = SLOT_W_UNIFORM
+ path = /obj/item/clothing/under/christmas/christmasmaleg
+
+/datum/gear/christmasfemaler
+ name = "Red Feminine Christmas Suit"
+ category = SLOT_W_UNIFORM
+ path = /obj/item/clothing/under/christmas/christmasfemaler
+
+/datum/gear/christmasfemaleg
+ name = "Green Feminine Christmas Suit"
+ category = SLOT_W_UNIFORM
+ path = /obj/item/clothing/under/christmas/christmasfemaleg
+
/datum/gear/pinkstripper
name = "Pink stripper outfit"
category = SLOT_W_UNIFORM
diff --git a/modular_citadel/code/modules/clothing/clothing.dm b/modular_citadel/code/modules/clothing/clothing.dm
deleted file mode 100644
index b23e805f92..0000000000
--- a/modular_citadel/code/modules/clothing/clothing.dm
+++ /dev/null
@@ -1,90 +0,0 @@
-/* //
-// GLOBALIZED POLYCHROME FOR ALL CLOTHING //
-// //
-// NOTICE: POLYCHROME STUFF MUST USE ALTERNATE_WORN_ICON AND PLACE THEIR OVERLAYS IN BOTH THE ICON AND ALTERNATE_WORN_ICON //
-// //
-*/////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
-
-// COPYPASTE THE FOLLOWING PROC TO WHATEVER CATERGORY OF CLOTHING YOU WANT TO POLYCHROME
-
-// THIS IS REQUIRED DUE TO EACH CLOTHING CATEGORY HAVING A SNOWFLAKE WORN_OVERLAYS() THING
-
-// Don't forget to append the appropriate typepath! Also, refer to polychromic_clothes.dm for example implementations
-
-/*
-/obj/item/clothing/worn_overlays(isinhands, icon_file) //this is where the main magic happens. Also mandates that ALL polychromic stuff MUST USE alternate_worn_icon
- . = ..()
- if(hasprimary | hassecondary | hastertiary)
- if(!isinhands) //prevents the worn sprites from showing up if you're just holding them
- if(hasprimary) //checks if overlays are enabled
- var/mutable_appearance/primary_worn = mutable_appearance(alternate_worn_icon, "[item_color]-primary") //automagical sprite selection
- primary_worn.color = primary_color //colors the overlay
- . += primary_worn //adds the overlay onto the buffer list to draw on the mob sprite.
- if(hassecondary)
- var/mutable_appearance/secondary_worn = mutable_appearance(alternate_worn_icon, "[item_color]-secondary")
- secondary_worn.color = secondary_color
- . += secondary_worn
- if(hastertiary)
- var/mutable_appearance/tertiary_worn = mutable_appearance(alternate_worn_icon, "[item_color]-tertiary")
- tertiary_worn.color = tertiary_color
- . += tertiary_worn
-*/
-
-/obj/item/clothing/
- var/hasprimary = FALSE //These vars allow you to choose which overlays a clothing has
- var/hassecondary = FALSE
- var/hastertiary = FALSE
- var/primary_color = "#FFFFFF" //RGB in hexcode
- var/secondary_color = "#FFFFFF"
- var/tertiary_color = "#808080"
-
- var/force_alternate_icon = FALSE
-
-/obj/item/clothing/update_icon() // picks the colored overlays from the ICON file
- ..()
- if(hasprimary) //Checks if the overlay is enabled
- var/mutable_appearance/primary_overlay = mutable_appearance(icon, "[item_color]-primary") //Automagically picks overlays
- primary_overlay.color = primary_color //Colors the greyscaled overlay
- add_overlay(primary_overlay) //Applies the coloured overlay onto the item sprite. but NOT the mob sprite.
- if(hassecondary)
- var/mutable_appearance/secondary_overlay = mutable_appearance(icon, "[item_color]-secondary")
- secondary_overlay.color = secondary_color
- add_overlay(secondary_overlay)
- if(hastertiary)
- var/mutable_appearance/tertiary_overlay = mutable_appearance(icon, "[item_color]-tertiary")
- tertiary_overlay.color = tertiary_color
- add_overlay(tertiary_overlay)
-
-/obj/item/clothing/AltClick(mob/living/user)
- ..()
- if(hasprimary | hassecondary | hastertiary)
- var/choice = input(user,"polychromic thread options", "Clothing Recolor") as null|anything in list("[hasprimary ? "Primary Color" : ""]", "[hassecondary ? "Secondary Color" : ""]", "[hastertiary ? "Tertiary Color" : ""]") //generates a list depending on the enabled overlays
- switch(choice) //Lets the list's options actually lead to something
- if("Primary Color")
- var/primary_color_input = input(usr,"","Choose Primary Color",primary_color) as color|null //color input menu, the "|null" adds a cancel button to it.
- if(primary_color_input) //Checks if the color selected is NULL, rejects it if it is NULL.
- primary_color = sanitize_hexcolor(primary_color_input, desired_format=6, include_crunch=1) //formats the selected color properly
- update_icon() //updates the item icon
- user.regenerate_icons() //updates the worn icon. Probably a bad idea, but it works.
- if("Secondary Color")
- var/secondary_color_input = input(usr,"","Choose Secondary Color",secondary_color) as color|null
- if(secondary_color_input)
- secondary_color = sanitize_hexcolor(secondary_color_input, desired_format=6, include_crunch=1)
- update_icon()
- user.regenerate_icons()
- if("Tertiary Color")
- var/tertiary_color_input = input(usr,"","Choose Tertiary Color",tertiary_color) as color|null
- if(tertiary_color_input)
- tertiary_color = sanitize_hexcolor(tertiary_color_input, desired_format=6, include_crunch=1)
- update_icon()
- user.regenerate_icons()
-
-/obj/item/clothing/examine(mob/user)
- . = ..()
- if(hasprimary | hassecondary | hastertiary)
- . += "Alt-click to recolor it."
-
-/obj/item/clothing/Initialize()
- ..()
- if(hasprimary | hassecondary | hastertiary)
- update_icon() //Applies the overlays and default colors onto the clothes on spawn.
\ No newline at end of file
diff --git a/modular_citadel/code/modules/custom_loadout/custom_items.dm b/modular_citadel/code/modules/custom_loadout/custom_items.dm
index 274a345369..3d88dae26c 100644
--- a/modular_citadel/code/modules/custom_loadout/custom_items.dm
+++ b/modular_citadel/code/modules/custom_loadout/custom_items.dm
@@ -510,3 +510,49 @@
icon_state = "onion"
item_state = "onion"
alternate_worn_icon = 'icons/mob/custom_w.dmi'
+
+/obj/item/clothing/under/mikubikini
+ name = "starlight singer bikini"
+ desc = " "
+ icon_state = "mikubikini"
+ item_state = "mikubikini"
+ icon = 'icons/obj/custom.dmi'
+ alternate_worn_icon = 'icons/mob/custom_w.dmi'
+ mutantrace_variation = NO_MUTANTRACE_VARIATION
+
+/obj/item/clothing/suit/mikujacket
+ name = "starlight singer jacket"
+ desc = " "
+ icon_state = "mikujacket"
+ item_state = "mikujacket"
+ icon = 'icons/obj/custom.dmi'
+ alternate_worn_icon = 'icons/mob/custom_w.dmi'
+ mutantrace_variation = NO_MUTANTRACE_VARIATION
+
+/obj/item/clothing/head/mikuhair
+ name = "starlight singer hair"
+ desc = " "
+ icon_state = "mikuhair"
+ item_state = "mikuhair"
+ icon = 'icons/obj/custom.dmi'
+ alternate_worn_icon = 'icons/mob/custom_w.dmi'
+ mutantrace_variation = NO_MUTANTRACE_VARIATION
+ flags_inv = HIDEHAIR
+
+/obj/item/clothing/gloves/mikugloves
+ name = "starlight singer gloves"
+ desc = " "
+ icon_state = "mikugloves"
+ item_state = "mikugloves"
+ icon = 'icons/obj/custom.dmi'
+ alternate_worn_icon = 'icons/mob/custom_w.dmi'
+ mutantrace_variation = NO_MUTANTRACE_VARIATION
+
+/obj/item/clothing/shoes/sneakers/mikuleggings
+ name = "starlight singer leggings"
+ desc = " "
+ icon_state = "mikuleggings"
+ item_state = "mikuleggings"
+ icon = 'icons/obj/custom.dmi'
+ alternate_worn_icon = 'icons/mob/custom_w.dmi'
+ mutantrace_variation = NO_MUTANTRACE_VARIATION
diff --git a/modular_citadel/code/modules/food_and_drinks/snacks/meat.dm b/modular_citadel/code/modules/food_and_drinks/snacks/meat.dm
deleted file mode 100644
index f1b5d622bc..0000000000
--- a/modular_citadel/code/modules/food_and_drinks/snacks/meat.dm
+++ /dev/null
@@ -1,29 +0,0 @@
-/obj/item/reagent_containers/food/snacks/carpmeat/aquatic
- name = "fillet"
- desc = "A fillet of one of the local water dwelling species."
-
-/obj/item/reagent_containers/food/snacks/meat/slab/human/mutant/ipc
- icon = 'modular_citadel/icons/obj/foods.dmi'
- icon_state = "ipcmeat"
- desc = "Gross robot meat."
- filling_color = "#000000"
- tastes = list("metal" = 1)
-
-/obj/item/reagent_containers/food/snacks/meat/slab/human/mutant/insect
- desc = "Tastes like chicken, that's... not what it is!"
- icon = 'modular_citadel/icons/obj/foods.dmi'
- icon_state = "mothmeat"
- filling_color = "#BF896B"
- tastes = list("insects" = 1)
-
-/obj/item/reagent_containers/food/snacks/meat/slab/human/mutant/avian
- desc = "Tastes like chicken, that's because it is!"
- icon = 'modular_citadel/icons/obj/foods.dmi'
- icon_state = "birdmeat"
- filling_color = "#BF896B"
- tastes = list("chicken" = 1)
-
-/obj/item/reagent_containers/food/snacks/meat/slab/human/mutant/mammal
- desc = "Tastes sweet... reminds you vaguely of chicken."
- filling_color = "#6B8E23"
- tastes = list("brains" = 1, "meat" = 1)
diff --git a/modular_citadel/code/modules/mob/living/silicon/robot/dogborg archive.dm b/modular_citadel/code/modules/mob/living/silicon/robot/dogborg archive.dm
deleted file mode 100644
index 8b5c0b0af0..0000000000
--- a/modular_citadel/code/modules/mob/living/silicon/robot/dogborg archive.dm
+++ /dev/null
@@ -1,76 +0,0 @@
-/obj/item/robot_module/loader
- name = "loader robot module"
-/obj/item/robot_module/loader/New()
- ..()
- emag = new /obj/item/borg/stun(src)
- modules += new /obj/item/extinguisher(src)
- modules += new /obj/item/weldingtool/largetank/cyborg(src)
- modules += new /obj/item/screwdriver(src)
- modules += new /obj/item/wrench(src)
- modules += new /obj/item/crowbar(src)
- modules += new /obj/item/wirecutters(src)
- modules += new /obj/item/multitool(src)
- modules += new /obj/item/t_scanner(src)
- modules += new /obj/item/analyzer(src)
- modules += new /obj/item/assembly/signaler
- modules += new /obj/item/soap/nanotrasen(src)
-
- fix_modules()
-
-/obj/item/robot_module/k9
- name = "Security K-9 Unit module"
-/obj/item/robot_module/k9/New()
- ..()
- modules += new /obj/item/restraints/handcuffs/cable/zipties/cyborg/dog(src)
- modules += new /obj/item/dogborg/jaws/big(src)
- modules += new /obj/item/dogborg/pounce(src)
- modules += new /obj/item/clothing/mask/gas/sechailer/cyborg(src)
- modules += new /obj/item/soap/tongue(src)
- modules += new /obj/item/analyzer/nose(src)
- modules += new /obj/item/storage/bag/borgdelivery(src)
- //modules += new /obj/item/assembly/signaler(src)
- //modules += new /obj/item/detective_scanner(src)
- modules += new /obj/item/gun/energy/disabler/cyborg(src)
- emag = new /obj/item/gun/energy/laser/cyborg(src)
- fix_modules()
-
-/obj/item/robot_module/security/respawn_consumable(mob/living/silicon/robot/R, coeff = 1)
- ..()
- var/obj/item/gun/energy/gun/advtaser/cyborg/T = locate(/obj/item/gun/energy/gun/advtaser/cyborg) in get_usable_modules()
- if(T)
- if(T.power_supply.charge < T.power_supply.maxcharge)
- var/obj/item/ammo_casing/energy/S = T.ammo_type[T.select]
- T.power_supply.give(S.e_cost * coeff)
- T.update_icon()
- else
- T.charge_tick = 0
- fix_modules()
-
-/obj/item/robot_module/borgi
- name = "Borgi module"
-
-/obj/item/robot_module/borgi/New()
- ..()
- modules += new /obj/item/dogborg/jaws/small(src)
- modules += new /obj/item/storage/bag/borgdelivery(src)
- modules += new /obj/item/soap/tongue(src)
- modules += new /obj/item/healthanalyzer(src)
- modules += new /obj/item/analyzer/nose(src)
- emag = new /obj/item/dogborg/pounce(src)
- fix_modules()
-
-/obj/item/robot_module/medihound
- name = "MediHound module"
-
-/obj/item/robot_module/medihound/New()
- ..()
- modules += new /obj/item/dogborg/jaws/small(src)
- modules += new /obj/item/storage/bag/borgdelivery(src)
- modules += new /obj/item/analyzer/nose(src)
- modules += new /obj/item/soap/tongue(src)
- modules += new /obj/item/healthanalyzer(src)
- modules += new /obj/item/dogborg/sleeper(src)
- modules += new /obj/item/twohanded/shockpaddles/hound(src)
- modules += new /obj/item/sensor_device(src)
- emag = new /obj/item/dogborg/pounce(src)
- fix_modules()
\ No newline at end of file
diff --git a/modular_citadel/code/modules/mob/living/silicon/robot/dogborg_equipment.dm b/modular_citadel/code/modules/mob/living/silicon/robot/dogborg_equipment.dm
index 17def26f1d..a1466f58d4 100644
--- a/modular_citadel/code/modules/mob/living/silicon/robot/dogborg_equipment.dm
+++ b/modular_citadel/code/modules/mob/living/silicon/robot/dogborg_equipment.dm
@@ -162,9 +162,6 @@ SLEEPER CODE IS IN game/objects/items/devices/dogborg_sleeper.dm !
to_chat(user, "[GLOB.meta_gas_names[id]]: [round(gas_concentration*100, 0.01)] %")
to_chat(user, "Temperature: [round(environment.temperature-T0C)] °C")
-/obj/item/analyzer/nose/AltClick(mob/user) //Barometer output for measuring when the next storm happens
- . = ..()
-
/obj/item/analyzer/nose/afterattack(atom/target, mob/user, proximity)
. = ..()
if(!proximity)
@@ -356,15 +353,6 @@ SLEEPER CODE IS IN game/objects/items/devices/dogborg_sleeper.dm !
icon = 'icons/mob/dogborg.dmi'
icon_state= "kibble"
-//Defibs
-
-/obj/item/twohanded/shockpaddles/cyborg/hound
- name = "Paws of Life"
- desc = "MediHound specific shock paws."
- icon = 'icons/mob/dogborg.dmi'
- icon_state = "defibpaddles0"
- item_state = "defibpaddles0"
-
// Pounce stuff for K-9
/obj/item/dogborg/pounce
diff --git a/modular_citadel/code/modules/mob/living/silicon/robot/robot_movement.dm b/modular_citadel/code/modules/mob/living/silicon/robot/robot_movement.dm
index 28327cde0e..59630186d1 100644
--- a/modular_citadel/code/modules/mob/living/silicon/robot/robot_movement.dm
+++ b/modular_citadel/code/modules/mob/living/silicon/robot/robot_movement.dm
@@ -14,7 +14,7 @@
. += speed
/mob/living/silicon/robot/proc/togglesprint(shutdown = FALSE) //Basically a copypaste of the proc from /mob/living/carbon/human
- if(!shutdown && (!cell || cell.charge < 25))
+ if(!shutdown && (!cell || cell.charge < 25) || !cansprint)
return FALSE
sprinting = shutdown ? FALSE : !sprinting
if(!resting && canmove)
diff --git a/modular_citadel/code/modules/mob/mob.dm b/modular_citadel/code/modules/mob/mob.dm
deleted file mode 100644
index aa0e6b5828..0000000000
--- a/modular_citadel/code/modules/mob/mob.dm
+++ /dev/null
@@ -1,27 +0,0 @@
-/mob/proc/use_that_empty_hand() //currently unused proc so i can implement 2-handing any item a lot easier in the future.
- return
-
-/mob/say_mod(input, message_mode)
- var/customsayverb = findtext(input, "*")
- if(customsayverb && message_mode != MODE_WHISPER_CRIT)
- message_mode = MODE_CUSTOM_SAY
- return lowertext(copytext(input, 1, customsayverb))
- else
- return ..()
-
-/atom/movable/proc/attach_spans(input, list/spans)
- var/customsayverb = findtext(input, "*")
- if(customsayverb)
- input = capitalize(copytext(input, customsayverb+1))
- if(input)
- return "[message_spans_start(spans)][input]"
- else
- return
-
-/mob/living/compose_message(atom/movable/speaker, datum/language/message_language, raw_message, radio_freq, list/spans, message_mode, face_name = FALSE)
- . = ..()
- if(istype(speaker, /mob/living))
- var/turf/speakturf = get_turf(speaker)
- var/turf/sourceturf = get_turf(src)
- if(istype(speakturf) && istype(sourceturf) && !(speakturf in get_hear(5, sourceturf)))
- . = "