diff --git a/code/game/antagonist/station/cultist.dm b/code/game/antagonist/station/cultist.dm index f103b2a8859..9c076ae901a 100644 --- a/code/game/antagonist/station/cultist.dm +++ b/code/game/antagonist/station/cultist.dm @@ -35,6 +35,16 @@ var/datum/antagonist/cultist/cult faction = "cult" + restricted_species = list( + "Baseline Frame", + "Shell Frame", + "Hephaestus G1 Industrial Frame", + "Hephaestus G2 Industrial Frame", + "Xion Industrial Frame", + "Zeng-Hu Mobility Frame", + "Bishop Accessory Frame" + ) + var/allow_narsie = 1 var/datum/mind/sacrifice_target var/list/allwords = list("travel","self","see","hell","blood","join","tech","destroy", "other", "hide") diff --git a/code/game/gamemodes/cult/runes.dm b/code/game/gamemodes/cult/runes.dm index 5e20a6b052b..69261101f69 100644 --- a/code/game/gamemodes/cult/runes.dm +++ b/code/game/gamemodes/cult/runes.dm @@ -133,6 +133,11 @@ var/list/sacrificed = list() target.hallucination = min(target.hallucination, 500) return 0 + //If you dont have blood, blood magic doesnt work on you + if(target.is_mechanical()) + attacker << "You sense that your powers can not effect them." + return 0 + target.take_overall_damage(0, rand(5, 20)) // You dirty resister cannot handle the damage to your mind. Easily. - even cultists who accept right away should experience some effects // Resist messages go! if(initial_message) //don't do this stuff right away, only if they resist or hesitate. diff --git a/html/changelogs/arrow768-noipccult.yml b/html/changelogs/arrow768-noipccult.yml new file mode 100644 index 00000000000..b7456f73f53 --- /dev/null +++ b/html/changelogs/arrow768-noipccult.yml @@ -0,0 +1,37 @@ +################################ +# Example Changelog File +# +# Note: This file, and files beginning with ".", and files that don't end in ".yml" will not be read. If you change this file, you will look really dumb. +# +# Your changelog will be merged with a master changelog. (New stuff added only, and only on the date entry for the day it was merged.) +# When it is, any changes listed below will disappear. +# +# Valid Prefixes: +# bugfix +# wip (For works in progress) +# tweak +# soundadd +# sounddel +# rscadd (general adding of nice things) +# rscdel (general deleting of nice things) +# imageadd +# imagedel +# maptweak +# spellcheck (typo fixes) +# experiment +# balance +################################# + +# Your name. +author: Arrow768 + +# Optional: Remove this file after generating master changelog. Useful for PR changelogs that won't get used again. +delete-after: True + +# Any changes you've made. See valid prefix list above. +# INDENT WITH TWO SPACES. NOT TABS. SPACES. +# SCREW THIS UP AND IT WON'T WORK. +# Also, all entries are changed into a single [] after a master changelog generation. Just remove the brackets when you add new entries. +# Please surround your changes in double quotes ("), as certain characters otherwise screws up compiling. The quotes will not show up in the changelog. +changes: + - tweak: "IPCs can no longer be converted to cultists."