Revert "12/21 modernizations from TG live"
This commit is contained in:
@@ -24,7 +24,7 @@
|
||||
if(H.stat)
|
||||
visible_message("<span class='warning'>Serrated tendrils eagerly pull [H] to [src], tearing the body apart as its blood seeps over the eggs.</span>")
|
||||
playsound(get_turf(src),'sound/magic/Demon_consume.ogg', 100, 1)
|
||||
if(ismegafauna(H))
|
||||
if(istype(H,/mob/living/simple_animal/hostile/megafauna/dragon))
|
||||
meat_counter += 20
|
||||
else
|
||||
meat_counter ++
|
||||
|
||||
@@ -1,5 +1,5 @@
|
||||
//The necropolis gate is used to call forth Legion from the Necropolis.
|
||||
/obj/structure/necropolis_gate
|
||||
/obj/structure/lavaland_door
|
||||
name = "necropolis gate"
|
||||
desc = "A tremendous and impossibly large gateway, bored into dense bedrock."
|
||||
icon = 'icons/effects/96x96.dmi'
|
||||
@@ -9,13 +9,12 @@
|
||||
opacity = 1
|
||||
bound_width = 96
|
||||
bound_height = 96
|
||||
pixel_x = -32
|
||||
resistance_flags = INDESTRUCTIBLE | LAVA_PROOF | FIRE_PROOF | UNACIDABLE | ACID_PROOF
|
||||
burn_state = LAVA_PROOF
|
||||
luminosity = 1
|
||||
var/boss = FALSE
|
||||
var/is_anyone_home = FALSE
|
||||
|
||||
/obj/structure/necropolis_gate/attack_hand(mob/user)
|
||||
/obj/structure/lavaland_door/attack_hand(mob/user)
|
||||
for(var/mob/living/simple_animal/hostile/megafauna/legion/L in mob_list)
|
||||
return
|
||||
if(is_anyone_home)
|
||||
@@ -52,10 +51,10 @@
|
||||
is_anyone_home = FALSE
|
||||
new/mob/living/simple_animal/hostile/megafauna/legion(get_step(src.loc, SOUTH))
|
||||
|
||||
/obj/structure/necropolis_gate/singularity_pull()
|
||||
/obj/structure/lavaland_door/singularity_pull()
|
||||
return 0
|
||||
|
||||
/obj/structure/necropolis_gate/Destroy(force)
|
||||
/obj/structure/lavaland_door/Destroy(force)
|
||||
if(force)
|
||||
. = ..()
|
||||
else
|
||||
|
||||
@@ -1,15 +0,0 @@
|
||||
//These landmarks can be placed in rooms/ruins to set the baseturfs of every turf in the area. Easier than having potentially unlimited subtypes of every turf or having to manually edit the turfs in the map editor
|
||||
|
||||
/obj/effect/baseturf_helper
|
||||
name = "lava baseturf editor"
|
||||
icon = 'icons/obj/weapons.dmi'
|
||||
icon_state = "syndballoon"
|
||||
var/baseturf = /turf/open/floor/plating/lava/smooth/lava_land_surface
|
||||
|
||||
/obj/effect/baseturf_helper/initialize()
|
||||
..()
|
||||
var/area/thearea = get_area(src)
|
||||
for(var/turf/T in get_area_turfs(thearea, z))
|
||||
if(T.baseturf != T.type) //Don't break indestructible walls and the like
|
||||
T.baseturf = baseturf
|
||||
qdel(src)
|
||||
@@ -20,7 +20,7 @@
|
||||
user << "<span class='userdanger'>No... just one more try...</span>"
|
||||
user.gib()
|
||||
else
|
||||
user.visible_message("<span class='warning'>[user] pulls [src]'s lever with a glint in [user.p_their()] eyes!</span>", "<span class='warning'>You feel a draining as you pull the lever, but you \
|
||||
user.visible_message("<span class='warning'>[user], pulls [src]'s lever with a glint in their eyes!</span>", "<span class='warning'>You feel a draining as you pull the lever, but you \
|
||||
know it'll be worth it.</span>")
|
||||
icon_state = "slots2"
|
||||
playsound(src, 'sound/lavaland/cursed_slot_machine.ogg', 50, 0)
|
||||
@@ -79,7 +79,7 @@
|
||||
/obj/effect/gluttony/CanPass(atom/movable/mover, turf/target, height=0)//So bullets will fly over and stuff.
|
||||
if(height==0)
|
||||
return 1
|
||||
if(ishuman(mover))
|
||||
if(istype(mover, /mob/living/carbon/human))
|
||||
var/mob/living/carbon/human/H = mover
|
||||
if(H.nutrition >= NUTRITION_LEVEL_FAT)
|
||||
H.visible_message("<span class='warning'>[H] pushes through [src]!</span>", "<span class='notice'>You've seen and eaten worse than this.</span>")
|
||||
@@ -97,7 +97,7 @@
|
||||
icon_state = "magic_mirror"
|
||||
|
||||
/obj/structure/mirror/magic/pride/curse(mob/user)
|
||||
user.visible_message("<span class='danger'><B>The ground splits beneath [user] as [user.p_their()] hand leaves the mirror!</B></span>", \
|
||||
user.visible_message("<span class='danger'><B>The ground splits beneath [user] as their hand leaves the mirror!</B></span>", \
|
||||
"<span class='notice'>Perfect. Much better! Now <i>nobody</i> will be able to resist yo-</span>")
|
||||
var/turf/T = get_turf(user)
|
||||
T.ChangeTurf(/turf/open/chasm/straight_down)
|
||||
@@ -114,7 +114,7 @@
|
||||
item_state = "render"
|
||||
force = 18
|
||||
throwforce = 10
|
||||
w_class = WEIGHT_CLASS_NORMAL
|
||||
w_class = 3
|
||||
hitsound = 'sound/weapons/bladeslice.ogg'
|
||||
|
||||
/obj/item/weapon/kitchen/knife/envy/afterattack(atom/movable/AM, mob/living/carbon/human/user, proximity)
|
||||
@@ -123,7 +123,7 @@
|
||||
return
|
||||
if(!istype(user))
|
||||
return
|
||||
if(ishuman(AM))
|
||||
if(istype(AM, /mob/living/carbon/human))
|
||||
var/mob/living/carbon/human/H = AM
|
||||
if(user.real_name != H.dna.real_name)
|
||||
user.real_name = H.dna.real_name
|
||||
|
||||
Reference in New Issue
Block a user