[MIRROR] Cult Fixes and Minor Balance Tweaks (#5913)

* Cult Fixes and Minor Balance Tweaks (#36092)

* Fixes and Balance Tweaks

* Faster deconversions

* Shade nerf

* Cult Fixes and Minor Balance Tweaks
This commit is contained in:
CitadelStationBot
2018-03-12 07:01:54 -05:00
committed by Poojawa
parent 1b98fbe316
commit 64abde83eb
7 changed files with 47 additions and 45 deletions
+3 -3
View File
@@ -26,8 +26,8 @@
return FALSE
else
return FALSE
if(M.isloyal() || issilicon(M) || isbot(M) || isdrone(M) || is_servant_of_ratvar(M))
return FALSE //can't convert machines, shielded, or ratvar's dogs
if(M.isloyal() || issilicon(M) || isbot(M) || isdrone(M) || is_servant_of_ratvar(M) || !M.client)
return FALSE //can't convert machines, shielded, braindead, or ratvar's dogs
return TRUE
/datum/game_mode/cult
@@ -80,7 +80,7 @@
cultist.special_role = ROLE_CULTIST
cultist.restricted_roles = restricted_jobs
log_game("[cultist.key] (ckey) has been selected as a cultist")
return (cultists_to_cult.len>=required_enemies)
+14 -1
View File
@@ -418,6 +418,19 @@
/obj/machinery/door/airlock/cult/canAIControl(mob/user)
return (iscultist(user) && !isAllPowerCut())
/obj/machinery/door/airlock/cult/obj_break(damage_flag)
if(!(flags_1 & BROKEN) && !(flags_1 & NODECONSTRUCT_1))
stat |= BROKEN
if(!panel_open)
panel_open = TRUE
update_icon()
/obj/machinery/door/airlock/cult/isElectrified()
return FALSE
/obj/machinery/door/airlock/cult/hasPower()
return TRUE
/obj/machinery/door/airlock/cult/allowed(mob/living/L)
if(!density)
return 1
@@ -487,7 +500,7 @@
/obj/machinery/door/airlock/cult/weak
name = "brittle cult airlock"
desc = "An airlock hastily corrupted by blood magic, it is unusually brittle in this state."
normal_integrity = 180
normal_integrity = 150
damage_deflection = 5
armor = list("melee" = 0, "bullet" = 0, "laser" = 0,"energy" = 0, "bomb" = 0, "bio" = 0, "rad" = 0, "fire" = 0, "acid" = 0)
@@ -114,6 +114,7 @@
desc = "The air hangs heavy over this sinister flooring."
icon_state = "plating"
CanAtmosPass = ATMOS_PASS_NO
floor_tile = null
var/obj/effect/clockwork/overlay/floor/bloodcult/realappearance