mirror of
https://github.com/Bubberstation/Bubberstation.git
synced 2026-08-30 08:37:43 +01:00
Lordpidey devil fixes (#24693)
* Devils made via event can no longer ascend. Admins can control whether or not a devil may ascend via traitor panel. * Adds logging * Fixes #21326, Fixes #21321 * Fixes compile error, removes dead code. * Moves logging to where it's supposed to be. * Arch devils can now destroy walls with pitchfork. * Fixes compile error. * Summon dancefloor can't be used to break down walls. * Improves disco floor wall check * Fixes traitor panel for devils. * refactors human attack_hand * Fixes compile error * Devils now respawn with clothes.
This commit is contained in:
@@ -32,7 +32,7 @@
|
||||
|
||||
var/mob/living/carbon/human/devil = create_event_devil(spawn_loc)
|
||||
Mind.transfer_to(devil)
|
||||
ticker.mode.finalize_devil(Mind)
|
||||
ticker.mode.finalize_devil(Mind, FALSE)
|
||||
ticker.mode.add_devil_objectives(src, 2)
|
||||
Mind.announceDevilLaws()
|
||||
Mind.announce_objectives()
|
||||
|
||||
@@ -198,13 +198,15 @@
|
||||
damage_clothes(15, BRUTE, "melee")
|
||||
return 1
|
||||
|
||||
/mob/living/carbon/human/attack_hand(mob/living/carbon/human/M)
|
||||
/mob/living/carbon/human/attack_hand(mob/user)
|
||||
if(..()) //to allow surgery to return properly.
|
||||
return
|
||||
if(M.a_intent == INTENT_DISARM)
|
||||
if(M.buckled_mobs && (src in M.buckled_mobs) && M.riding_datum)
|
||||
M.riding_datum.force_dismount(src)
|
||||
dna.species.spec_attack_hand(M, src)
|
||||
if(ishuman(user))
|
||||
var/mob/living/carbon/human/H = user
|
||||
if(H.a_intent == INTENT_DISARM)
|
||||
if(H.buckled_mobs && (src in H.buckled_mobs) && H.riding_datum)
|
||||
H.riding_datum.force_dismount(src)
|
||||
dna.species.spec_attack_hand(H, src)
|
||||
|
||||
|
||||
/mob/living/carbon/human/attack_paw(mob/living/carbon/monkey/M)
|
||||
|
||||
@@ -232,9 +232,12 @@
|
||||
var/turf/T = dancefloor_turfs[i]
|
||||
T.ChangeTurf(dancefloor_turfs_types[i])
|
||||
else
|
||||
var/list/funky_turfs = RANGE_TURFS(1, user)
|
||||
for(var/turf/closed/solid in funky_turfs)
|
||||
user << "<span class='warning'>You're too close to a wall.</span>"
|
||||
return
|
||||
dancefloor_exists = TRUE
|
||||
var/i = 1
|
||||
var/list/funky_turfs = RANGE_TURFS(1, user)
|
||||
dancefloor_turfs.len = funky_turfs.len
|
||||
dancefloor_turfs_types.len = funky_turfs.len
|
||||
for(var/t in funky_turfs)
|
||||
|
||||
Reference in New Issue
Block a user