diff --git a/code/__DEFINES/combat.dm b/code/__DEFINES/combat.dm index 3bacaa08d5ee..47189ae8b285 100644 --- a/code/__DEFINES/combat.dm +++ b/code/__DEFINES/combat.dm @@ -185,17 +185,6 @@ GLOBAL_LIST_INIT(shove_disarming_types, typecacheof(list( #define IS_SHARP 1 #define IS_SHARP_ACCURATE 2 -//His Grace. -#define HIS_GRACE_SATIATED 0 //He hungers not. If bloodthirst is set to this, His Grace is asleep. -#define HIS_GRACE_PECKISH 20 //Slightly hungry. -#define HIS_GRACE_HUNGRY 60 //Getting closer. Increases damage up to a minimum of 20. -#define HIS_GRACE_FAMISHED 100 //Dangerous. Increases damage up to a minimum of 25 and cannot be dropped. -#define HIS_GRACE_STARVING 120 //Incredibly close to breaking loose. Increases damage up to a minimum of 30. -#define HIS_GRACE_CONSUME_OWNER 140 //His Grace consumes His owner at this point and becomes aggressive. -#define HIS_GRACE_FALL_ASLEEP 160 //If it reaches this point, He falls asleep and resets. - -#define HIS_GRACE_FORCE_BONUS 4 //How much force is gained per kill. - #define EXPLODE_NONE 0 //Don't even ask me why we need this. #define EXPLODE_DEVASTATE 1 #define EXPLODE_HEAVY 2 diff --git a/code/__DEFINES/span.dm b/code/__DEFINES/span.dm index 1974c99ce9b8..847029d93e0b 100644 --- a/code/__DEFINES/span.dm +++ b/code/__DEFINES/span.dm @@ -53,7 +53,6 @@ #define span_hierophant(str) ("" + str + "") #define span_hierophant_warning(str) ("" + str + "") #define span_highlight(str) ("" + str + "") -#define span_his_grace(str) ("" + str + "") #define span_holoparasite(str) ("" + str + "") #define span_hypnophrase(str) ("" + str + "") #define span_icon(str) ("" + str + "") diff --git a/code/__DEFINES/status_effects.dm b/code/__DEFINES/status_effects.dm index 5fe9650c222a..d1fbf26616d5 100644 --- a/code/__DEFINES/status_effects.dm +++ b/code/__DEFINES/status_effects.dm @@ -18,8 +18,6 @@ #define STATUS_EFFECT_POWERREGEN /datum/status_effect/cyborg_power_regen //Regenerates power on a given cyborg over time -#define STATUS_EFFECT_HISGRACE /datum/status_effect/his_grace //His Grace. - #define STATUS_EFFECT_WISH_GRANTERS_GIFT /datum/status_effect/wish_granters_gift //If you're currently resurrecting with the Wish Granter #define STATUS_EFFECT_BLOODDRUNK /datum/status_effect/blooddrunk //Stun immunity and greatly reduced damage taken diff --git a/code/__DEFINES/traits.dm b/code/__DEFINES/traits.dm index bfbf62f2482f..26d82fba3278 100644 --- a/code/__DEFINES/traits.dm +++ b/code/__DEFINES/traits.dm @@ -379,7 +379,6 @@ Remember to update _globalvars/traits.dm if you're adding/removing/renaming trai #define CHRONO_GUN_TRAIT "chrono-gun" #define REVERSE_BEAR_TRAP_TRAIT "reverse-bear-trap" #define CURSED_MASK_TRAIT "cursed-mask" -#define HIS_GRACE_TRAIT "his-grace" #define HAND_REPLACEMENT_TRAIT "magic-hand" #define HOT_POTATO_TRAIT "hot-potato" #define ABDUCTOR_VEST_TRAIT "abductor-vest" diff --git a/code/datums/status_effects/buffs.dm b/code/datums/status_effects/buffs.dm index 568196c1460b..03808a86d076 100644 --- a/code/datums/status_effects/buffs.dm +++ b/code/datums/status_effects/buffs.dm @@ -65,57 +65,6 @@ playsound(cyborg, 'sound/effects/light_flicker.ogg', 50, TRUE) cyborg.cell.give(power_to_give) -/datum/status_effect/his_grace - id = "his_grace" - duration = -1 - tick_interval = 4 - alert_type = /atom/movable/screen/alert/status_effect/his_grace - var/bloodlust = 0 - -/atom/movable/screen/alert/status_effect/his_grace - name = "His Grace" - desc = "His Grace hungers, and you must feed Him." - icon_state = "his_grace" - alerttooltipstyle = "hisgrace" - -/atom/movable/screen/alert/status_effect/his_grace/MouseEntered(location,control,params) - desc = initial(desc) - var/datum/status_effect/his_grace/HG = attached_effect - desc += "
Current Bloodthirst: [HG.bloodlust]\ -
Becomes undroppable at [HIS_GRACE_FAMISHED]\ -
Will consume you at [HIS_GRACE_CONSUME_OWNER]" - return ..() - -/datum/status_effect/his_grace/on_apply() - owner.log_message("gained His Grace's stun immunity", LOG_ATTACK) - owner.add_stun_absorption("hisgrace", INFINITY, 3, null, "His Grace protects you from the stun!") - return ..() - -/datum/status_effect/his_grace/tick() - bloodlust = 0 - var/graces = 0 - for(var/obj/item/his_grace/HG in owner.held_items) - if(HG.bloodthirst > bloodlust) - bloodlust = HG.bloodthirst - if(HG.awakened) - graces++ - if(!graces) - owner.apply_status_effect(STATUS_EFFECT_HISWRATH) - qdel(src) - return - var/grace_heal = bloodlust * 0.05 - owner.adjustBruteLoss(-grace_heal) - owner.adjustFireLoss(-grace_heal) - owner.adjustToxLoss(-grace_heal, TRUE, TRUE) - owner.adjustOxyLoss(-(grace_heal * 2)) - owner.adjustCloneLoss(-grace_heal) - -/datum/status_effect/his_grace/on_remove() - owner.log_message("lost His Grace's stun immunity", LOG_ATTACK) - if(islist(owner.stun_absorption) && owner.stun_absorption["hisgrace"]) - owner.stun_absorption -= "hisgrace" - - /datum/status_effect/wish_granters_gift //Fully revives after ten seconds. id = "wish_granters_gift" duration = 50 diff --git a/code/datums/status_effects/debuffs.dm b/code/datums/status_effects/debuffs.dm index 24f9a777361e..fdc1710c9ea7 100644 --- a/code/datums/status_effects/debuffs.dm +++ b/code/datums/status_effects/debuffs.dm @@ -285,26 +285,6 @@ /datum/status_effect/pacify/on_remove() REMOVE_TRAIT(owner, TRAIT_PACIFISM, "status_effect") -/datum/status_effect/his_wrath //does minor damage over time unless holding His Grace - id = "his_wrath" - duration = -1 - tick_interval = 4 - alert_type = /atom/movable/screen/alert/status_effect/his_wrath - -/atom/movable/screen/alert/status_effect/his_wrath - name = "His Wrath" - desc = "You fled from His Grace instead of feeding Him, and now you suffer." - icon_state = "his_grace" - alerttooltipstyle = "hisgrace" - -/datum/status_effect/his_wrath/tick() - for(var/obj/item/his_grace/HG in owner.held_items) - qdel(src) - return - owner.adjustBruteLoss(0.1) - owner.adjustFireLoss(0.1) - owner.adjustToxLoss(0.2, TRUE, TRUE) - /datum/status_effect/cultghost //is a cult ghost and can't use manifest runes id = "cult_ghost" duration = -1 diff --git a/code/game/data_huds.dm b/code/game/data_huds.dm index 0890a039080b..14b3887ca539 100644 --- a/code/game/data_huds.dm +++ b/code/game/data_huds.dm @@ -194,10 +194,8 @@ Medical HUD! Basic mode needs suit sensors on. holder.icon_state = "huddefib" else holder.icon_state = "huddead" - //WS Begin - Borers else if(has_brain_worms() && B != null && B.controlling) holder.icon_state = "hudbrainworm" - //WS end else switch(virus_threat) if(DISEASE_SEVERITY_BIOHAZARD) diff --git a/code/game/objects/items/his_grace.dm b/code/game/objects/items/his_grace.dm deleted file mode 100644 index f2b71684bfb6..000000000000 --- a/code/game/objects/items/his_grace.dm +++ /dev/null @@ -1,256 +0,0 @@ -//His Grace is a very special weapon granted only to traitor chaplains. -//When awakened, He thirsts for blood and begins ticking a "bloodthirst" counter. -//The wielder of His Grace is immune to stuns and gradually heals. -//If the wielder fails to feed His Grace in time, He will devour them and become incredibly aggressive. -//Leaving His Grace alone for some time will reset His thirst and put Him to sleep. -//Using His Grace effectively requires extreme speed and care. -/obj/item/his_grace - name = "artistic toolbox" - desc = "A toolbox painted bright green. Looking at it makes you feel uneasy." - icon_state = "his_grace" - item_state = "artistic_toolbox" - lefthand_file = 'icons/mob/inhands/equipment/toolbox_lefthand.dmi' - righthand_file = 'icons/mob/inhands/equipment/toolbox_righthand.dmi' - icon = 'icons/obj/items_and_weapons.dmi' - w_class = WEIGHT_CLASS_GIGANTIC - force = 12 - attack_verb = list("robusted") - hitsound = 'sound/weapons/smash.ogg' - var/awakened = FALSE - var/bloodthirst = HIS_GRACE_SATIATED - var/prev_bloodthirst = HIS_GRACE_SATIATED - var/force_bonus = 0 - var/ascended = FALSE - var/victims_needed = 25 - var/ascend_bonus = 15 - -/obj/item/his_grace/Initialize() - . = ..() - START_PROCESSING(SSprocessing, src) - GLOB.poi_list += src - RegisterSignal(src, COMSIG_MOVABLE_POST_THROW, .proc/move_gracefully) - -/obj/item/his_grace/Destroy() - STOP_PROCESSING(SSprocessing, src) - GLOB.poi_list -= src - for(var/mob/living/L in src) - L.forceMove(get_turf(src)) - return ..() - -/obj/item/his_grace/attack_self(mob/living/user) - if(!awakened) - INVOKE_ASYNC(src, .proc/awaken, user) - -/obj/item/his_grace/attack(mob/living/M, mob/user) - if(awakened && M.stat) - consume(M) - else - ..() - -/obj/item/his_grace/CtrlClick(mob/user) //you can't pull his grace - return - -/obj/item/his_grace/examine(mob/user) - . = ..() - if(awakened) - switch(bloodthirst) - if(HIS_GRACE_SATIATED to HIS_GRACE_PECKISH) - . += "[src] isn't very hungry. Not yet." - if(HIS_GRACE_PECKISH to HIS_GRACE_HUNGRY) - . += "[src] would like a snack." - if(HIS_GRACE_HUNGRY to HIS_GRACE_FAMISHED) - . += "[src] is quite hungry now." - if(HIS_GRACE_FAMISHED to HIS_GRACE_STARVING) - . += "[src] is openly salivating at the sight of you. Be careful." - if(HIS_GRACE_STARVING to HIS_GRACE_CONSUME_OWNER) - . += "You walk a fine line. [src] is very close to devouring you." - if(HIS_GRACE_CONSUME_OWNER to HIS_GRACE_FALL_ASLEEP) - . += "[src] is shaking violently and staring directly at you." - else - . += "[src] is latched closed." - -/obj/item/his_grace/relaymove(mob/living/user, direction) //Allows changelings, etc. to climb out of Him after they revive, provided He isn't active - if(!awakened) - user.forceMove(get_turf(src)) - user.visible_message("[user] scrambles out of [src]!", "You climb out of [src]!") - -/obj/item/his_grace/process() - if(!bloodthirst) - drowse() - return - if(bloodthirst < HIS_GRACE_CONSUME_OWNER && !ascended) - adjust_bloodthirst(1 + FLOOR(LAZYLEN(contents) * 0.5, 1)) //Maybe adjust this? - else - adjust_bloodthirst(1) //don't cool off rapidly once we're at the point where His Grace consumes all. - var/mob/living/master = get_atom_on_turf(src, /mob/living) - if(istype(master) && (src in master.held_items)) - switch(bloodthirst) - if(HIS_GRACE_CONSUME_OWNER to HIS_GRACE_FALL_ASLEEP) - master.visible_message("[src] turns on [master]!", "[src] turns on you!") - do_attack_animation(master, null, src) - master.emote("scream") - master.remove_status_effect(STATUS_EFFECT_HISGRACE) - REMOVE_TRAIT(src, TRAIT_NODROP, HIS_GRACE_TRAIT) - master.Paralyze(60) - master.adjustBruteLoss(master.maxHealth) - playsound(master, 'sound/effects/splat.ogg', 100, FALSE) - else - master.apply_status_effect(STATUS_EFFECT_HISGRACE) - return - forceMove(get_turf(src)) //no you can't put His Grace in a locker you just have to deal with Him - if(bloodthirst < HIS_GRACE_CONSUME_OWNER) - return - if(bloodthirst >= HIS_GRACE_FALL_ASLEEP) - drowse() - return - var/list/targets = list() - for(var/mob/living/L in oview(2, src)) - targets += L - if(!LAZYLEN(targets)) - return - var/mob/living/L = pick(targets) - step_to(src, L) - if(Adjacent(L)) - if(!L.stat) - L.visible_message("[src] lunges at [L]!", "[src] lunges at you!") - do_attack_animation(L, null, src) - playsound(L, 'sound/weapons/smash.ogg', 50, TRUE) - playsound(L, 'sound/misc/desceration-01.ogg', 50, TRUE) - L.adjustBruteLoss(force) - adjust_bloodthirst(-5) //Don't stop attacking they're right there! - else - consume(L) - -/obj/item/his_grace/proc/awaken(mob/user) //Good morning, Mr. Grace. - if(awakened) - return - awakened = TRUE - user.visible_message("[src] begins to rattle. He thirsts.", "You flick [src]'s latch up. You hope this is a good idea.") - name = "His Grace" - desc = "A bloodthirsty artifact created by a profane rite." - gender = MALE - adjust_bloodthirst(1) - force_bonus = HIS_GRACE_FORCE_BONUS * LAZYLEN(contents) - playsound(user, 'sound/effects/pope_entry.ogg', 100) - icon_state = "his_grace_awakened" - move_gracefully() - -/obj/item/his_grace/proc/move_gracefully() - SIGNAL_HANDLER - - if(!awakened) - return - 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/his_grace/proc/drowse() //Good night, Mr. Grace. - if(!awakened || ascended) - return - var/turf/T = get_turf(src) - T.visible_message("[src] slowly stops rattling and falls still, His latch snapping shut.") - playsound(loc, 'sound/weapons/batonextend.ogg', 100, TRUE) - name = initial(name) - desc = initial(desc) - icon_state = initial(icon_state) - animate(src, transform=matrix()) - gender = initial(gender) - force = initial(force) - force_bonus = initial(force_bonus) - awakened = FALSE - bloodthirst = 0 - -/obj/item/his_grace/proc/consume(mob/living/meal) //Here's your dinner, Mr. Grace. - if(!meal) - return - var/victims = 0 - meal.visible_message("[src] swings open and devours [meal]!", "[src] consumes you!") - meal.adjustBruteLoss(200) - playsound(meal, 'sound/misc/desceration-02.ogg', 75, TRUE) - playsound(src, 'sound/items/eatfood.ogg', 100, TRUE) - meal.forceMove(src) - force_bonus += HIS_GRACE_FORCE_BONUS - prev_bloodthirst = bloodthirst - if(prev_bloodthirst < HIS_GRACE_CONSUME_OWNER) - bloodthirst = max(LAZYLEN(contents), 1) //Never fully sated, and His hunger will only grow. - else - bloodthirst = HIS_GRACE_CONSUME_OWNER - for(var/mob/living/C in contents) - if(C.mind) - victims++ - if(victims >= victims_needed) - ascend() - update_stats() - -/obj/item/his_grace/proc/adjust_bloodthirst(amt) - prev_bloodthirst = bloodthirst - if(prev_bloodthirst < HIS_GRACE_CONSUME_OWNER && !ascended) - bloodthirst = clamp(bloodthirst + amt, HIS_GRACE_SATIATED, HIS_GRACE_CONSUME_OWNER) - else if(!ascended) - bloodthirst = clamp(bloodthirst + amt, HIS_GRACE_CONSUME_OWNER, HIS_GRACE_FALL_ASLEEP) - update_stats() - -/obj/item/his_grace/proc/update_stats() - REMOVE_TRAIT(src, TRAIT_NODROP, HIS_GRACE_TRAIT) - var/mob/living/master = get_atom_on_turf(src, /mob/living) - switch(bloodthirst) - if(HIS_GRACE_CONSUME_OWNER to HIS_GRACE_FALL_ASLEEP) - if(HIS_GRACE_CONSUME_OWNER > prev_bloodthirst) - master.visible_message("[src] enters a frenzy!") - if(HIS_GRACE_STARVING to HIS_GRACE_CONSUME_OWNER) - ADD_TRAIT(src, TRAIT_NODROP, HIS_GRACE_TRAIT) - if(HIS_GRACE_STARVING > prev_bloodthirst) - master.visible_message("[src] is starving!", "[src]'s bloodlust overcomes you. [src] must be fed, or you will become His meal.\ - [force_bonus < 15 ? " And still, His power grows.":""]") - force_bonus = max(force_bonus, 15) - if(HIS_GRACE_FAMISHED to HIS_GRACE_STARVING) - ADD_TRAIT(src, TRAIT_NODROP, HIS_GRACE_TRAIT) - if(HIS_GRACE_FAMISHED > prev_bloodthirst) - master.visible_message("[src] is very hungry!", "Spines sink into your hand. [src] must feed immediately.\ - [force_bonus < 10 ? " His power grows.":""]") - force_bonus = max(force_bonus, 10) - if(prev_bloodthirst >= HIS_GRACE_STARVING) - master.visible_message("[src] is now only very hungry!", "Your bloodlust recedes.") - if(HIS_GRACE_HUNGRY to HIS_GRACE_FAMISHED) - if(HIS_GRACE_HUNGRY > prev_bloodthirst) - master.visible_message("[src] is getting hungry.", "You feel [src]'s hunger within you.\ - [force_bonus < 5 ? " His power grows.":""]") - force_bonus = max(force_bonus, 5) - if(prev_bloodthirst >= HIS_GRACE_FAMISHED) - master.visible_message("[src] is now only somewhat hungry.", "[src]'s hunger recedes a little...") - if(HIS_GRACE_PECKISH to HIS_GRACE_HUNGRY) - if(HIS_GRACE_PECKISH > prev_bloodthirst) - master.visible_message("[src] is feeling snackish.", "[src] begins to hunger.") - if(prev_bloodthirst >= HIS_GRACE_HUNGRY) - master.visible_message("[src] is now only a little peckish.", "[src]'s hunger recedes somewhat...") - if(HIS_GRACE_SATIATED to HIS_GRACE_PECKISH) - if(prev_bloodthirst >= HIS_GRACE_PECKISH) - master.visible_message("[src] is satiated.", "[src]'s hunger recedes...") - force = initial(force) + force_bonus - -/obj/item/his_grace/proc/ascend() - if(ascended) - return - var/mob/living/carbon/human/master = loc - force_bonus += ascend_bonus - desc = "A legendary toolbox and a distant artifact from The Age of Three Powers. On its three latches engraved are the words \"The Sun\", \"The Moon\", and \"The Stars\". The entire toolbox has the words \"The World\" engraved into its sides." - icon_state = "his_grace_ascended" - item_state = "toolbox_gold" - ascended = TRUE - playsound(src, 'sound/effects/his_grace_ascend.ogg', 100) - if(istype(master)) - master.visible_message("Gods will be watching.") - name = "[master]'s mythical toolbox of three powers" diff --git a/code/game/objects/structures/icemoon/cave_entrance.dm b/code/game/objects/structures/icemoon/cave_entrance.dm index 49acca358434..a4523da28ed7 100644 --- a/code/game/objects/structures/icemoon/cave_entrance.dm +++ b/code/game/objects/structures/icemoon/cave_entrance.dm @@ -282,7 +282,6 @@ GLOBAL_LIST_INIT(ore_probability, list( new /mob/living/simple_animal/hostile/netherworld(loc) new /mob/living/simple_animal/hostile/netherworld/blankbody(loc) if(prob(5)) - new /obj/item/his_grace(loc)//trust me, it's not worth the trouble. new /mob/living/simple_animal/hostile/netherworld/migo(loc) new /mob/living/simple_animal/hostile/netherworld/blankbody(loc) new /mob/living/simple_animal/hostile/netherworld/migo(loc) diff --git a/code/game/objects/structures/training_machine.dm b/code/game/objects/structures/training_machine.dm index f3a17f9c2f07..c4940e941f2f 100644 --- a/code/game/objects/structures/training_machine.dm +++ b/code/game/objects/structures/training_machine.dm @@ -329,7 +329,7 @@ /** * Device that simply counts the number of times you've hit a mob or target with. Looks like a toolbox but isn't. * - * Also has a 'Lap' function for keeping track of hits made at a certain point. Also, looks kinda like his grace for laughs and pranks. + * Also has a 'Lap' function for keeping track of hits made at a certain point. */ /obj/item/training_toolbox name = "Training Toolbox" diff --git a/code/modules/food_and_drinks/kitchen_machinery/deep_fryer.dm b/code/modules/food_and_drinks/kitchen_machinery/deep_fryer.dm index 82b0105c2612..327c7b422398 100644 --- a/code/modules/food_and_drinks/kitchen_machinery/deep_fryer.dm +++ b/code/modules/food_and_drinks/kitchen_machinery/deep_fryer.dm @@ -45,7 +45,8 @@ /obj/item/reagent_containers/food/condiment, /obj/item/storage, /obj/item/smallDelivery, - /obj/item/his_grace)) + ) + ) var/datum/looping_sound/deep_fryer/fry_loop /obj/machinery/deepfryer/Initialize() diff --git a/code/modules/mining/equipment/survival_pod.dm b/code/modules/mining/equipment/survival_pod.dm index f936e82169c7..1bf858b8aa60 100644 --- a/code/modules/mining/equipment/survival_pod.dm +++ b/code/modules/mining/equipment/survival_pod.dm @@ -312,7 +312,6 @@ /obj/item/lava_staff, /obj/item/energy_katana, /obj/item/hierophant_club, - /obj/item/his_grace, /obj/item/gun/energy/minigun, /obj/item/gun/ballistic/automatic/hmg/l6_saw, /obj/item/gun/magic/staff/chaos, diff --git a/code/modules/mob/living/carbon/monkey/death.dm b/code/modules/mob/living/carbon/monkey/death.dm index 22621a3750e4..048056367585 100644 --- a/code/modules/mob/living/carbon/monkey/death.dm +++ b/code/modules/mob/living/carbon/monkey/death.dm @@ -5,5 +5,5 @@ new /obj/effect/temp_visual/dust_animation(loc, "dust-m") /mob/living/carbon/monkey/death(gibbed) - walk(src,0) // Stops dead monkeys from fleeing their attacker or climbing out from inside His Grace + walk(src,0) // Stops dead monkeys from fleeing their attacker . = ..() diff --git a/code/modules/uplink/uplink_items.dm b/code/modules/uplink/uplink_items.dm index 98798d1fe6f8..c5050d08c0b7 100644 --- a/code/modules/uplink/uplink_items.dm +++ b/code/modules/uplink/uplink_items.dm @@ -1872,17 +1872,6 @@ GLOBAL_LIST_INIT(uplink_items, subtypesof(/datum/uplink_item)) restricted_roles = list("Curator") limited_stock = 1 //please don't spam deadchat -/datum/uplink_item/role_restricted/his_grace - name = "His Grace" - desc = "An incredibly dangerous weapon recovered from a Nanotrasen station overcome by the grey tide. Once activated, He will thirst for blood and must be used to kill to sate that thirst. \ - His Grace grants gradual regeneration and complete stun immunity to His wielder, but be wary: if He gets too hungry, He will become impossible to drop and eventually kill you if not fed. \ - However, if left alone for long enough, He will fall back to slumber. \ - To activate His Grace, simply unlatch Him." - item = /obj/item/his_grace - cost = 20 - restricted_roles = list("Chaplain") - surplus = 5 //Very low chance to get it in a surplus crate even without being the chaplain - /datum/uplink_item/role_restricted/cultconstructkit name = "Cult Construct Kit" desc = "Recovered from an abandoned Nar'sie cult lair two construct shells and a stash of empty soulstones was found. These were purified to prevent occult contamination and have been put in a belt so they may be used as an accessible source of disposable minions. The construct shells have been packaged into two beacons for rapid and portable deployment." diff --git a/interface/stylesheet.dm b/interface/stylesheet.dm index 5ac61559d0e4..81cc230cf535 100644 --- a/interface/stylesheet.dm +++ b/interface/stylesheet.dm @@ -127,7 +127,6 @@ h1.alert, h2.alert {color: #000000;} .redtext {color: #FF0000; font-size: 3;} .clown {color: #FF69Bf; font-size: 3; font-family: "Comic Sans MS", cursive, sans-serif; font-weight: bold;} .singing {font-family: "Trebuchet MS", cursive, sans-serif; font-style: italic;} -.his_grace {color: #15D512; font-family: "Courier New", cursive, sans-serif; font-style: italic;} .hypnophrase {color: #3bb5d3; font-weight: bold; animation: hypnocolor 1500ms infinite; animation-direction: alternate;} @keyframes hypnocolor { 0% {color: #0d0d0d;} diff --git a/shiptest.dme b/shiptest.dme index 91f3601e9eb0..1777d7d28184 100644 --- a/shiptest.dme +++ b/shiptest.dme @@ -1119,7 +1119,6 @@ #include "code\game\objects\items\gift.dm" #include "code\game\objects\items\granters.dm" #include "code\game\objects\items\handcuffs.dm" -#include "code\game\objects\items\his_grace.dm" #include "code\game\objects\items\holosign_creator.dm" #include "code\game\objects\items\holy_weapons.dm" #include "code\game\objects\items\hot_potato.dm"