mirror of
https://github.com/ParadiseSS13/Paradise.git
synced 2026-07-17 01:53:35 +01:00
Ruin fixes
This commit is contained in:
@@ -30,10 +30,7 @@
|
|||||||
},
|
},
|
||||||
/area/ruin/unpowered)
|
/area/ruin/unpowered)
|
||||||
"g" = (
|
"g" = (
|
||||||
/obj/structure/reagent_dispensers/water_cooler{
|
/obj/structure/reagent_dispensers/water_cooler/pizzaparty,
|
||||||
name = "punch cooler";
|
|
||||||
reagent_id = /datum/reagent/consumable/ethanol/bacchus_blessing
|
|
||||||
},
|
|
||||||
/obj/effect/decal/cleanable/dirt,
|
/obj/effect/decal/cleanable/dirt,
|
||||||
/turf/simulated/floor/wood{
|
/turf/simulated/floor/wood{
|
||||||
oxygen = 14;
|
oxygen = 14;
|
||||||
|
|||||||
@@ -495,7 +495,7 @@ var/list/teleport_runes = list()
|
|||||||
/obj/effect/rune/narsie/New()
|
/obj/effect/rune/narsie/New()
|
||||||
..()
|
..()
|
||||||
cultist_name = "Summon [SSticker.cultdat ? SSticker.cultdat.entity_name : "your god"]"
|
cultist_name = "Summon [SSticker.cultdat ? SSticker.cultdat.entity_name : "your god"]"
|
||||||
cultist_desc = "tears apart dimensional barriers, calling forth [SSticker.cultdat.entity_title3]. Requires 9 invokers."
|
cultist_desc = "tears apart dimensional barriers, calling forth [SSticker.cultdat ? SSticker.cultdat.entity_title3 : "your god"]. Requires 9 invokers."
|
||||||
|
|
||||||
/obj/effect/rune/narsie/check_icon()
|
/obj/effect/rune/narsie/check_icon()
|
||||||
return
|
return
|
||||||
|
|||||||
@@ -32,6 +32,8 @@
|
|||||||
if(resistance_flags & INDESTRUCTIBLE)
|
if(resistance_flags & INDESTRUCTIBLE)
|
||||||
return
|
return
|
||||||
if(istype(C, /obj/item/wirecutters))
|
if(istype(C, /obj/item/wirecutters))
|
||||||
|
var/obj/item/wirecutters/W = C
|
||||||
|
playsound(loc, W.usesound, 50, 1)
|
||||||
to_chat(user, "<span class='notice'>Slicing [name] joints...</span>")
|
to_chat(user, "<span class='notice'>Slicing [name] joints...</span>")
|
||||||
deconstruct()
|
deconstruct()
|
||||||
else
|
else
|
||||||
|
|||||||
@@ -19,12 +19,10 @@
|
|||||||
|
|
||||||
/turf/simulated/floor/plating/damaged/New()
|
/turf/simulated/floor/plating/damaged/New()
|
||||||
..()
|
..()
|
||||||
icon_state = icon_plating
|
|
||||||
break_tile()
|
break_tile()
|
||||||
|
|
||||||
/turf/simulated/floor/plating/burnt/New()
|
/turf/simulated/floor/plating/burnt/New()
|
||||||
..()
|
..()
|
||||||
icon_state = icon_plating
|
|
||||||
burn_tile()
|
burn_tile()
|
||||||
|
|
||||||
/turf/simulated/floor/plating/update_icon()
|
/turf/simulated/floor/plating/update_icon()
|
||||||
|
|||||||
@@ -64,7 +64,7 @@
|
|||||||
attacktext = "punches"
|
attacktext = "punches"
|
||||||
deathmessage = "falls apart into a fine dust."
|
deathmessage = "falls apart into a fine dust."
|
||||||
|
|
||||||
/mob/living/simple_animal/hostile/spawner
|
/mob/living/simple_animal/hostile/spawner/nether
|
||||||
name = "netherworld link"
|
name = "netherworld link"
|
||||||
desc = null //see examine()
|
desc = null //see examine()
|
||||||
icon_state = "nether"
|
icon_state = "nether"
|
||||||
@@ -76,18 +76,18 @@
|
|||||||
mob_types = list(/mob/living/simple_animal/hostile/netherworld/migo, /mob/living/simple_animal/hostile/netherworld, /mob/living/simple_animal/hostile/netherworld/blankbody)
|
mob_types = list(/mob/living/simple_animal/hostile/netherworld/migo, /mob/living/simple_animal/hostile/netherworld, /mob/living/simple_animal/hostile/netherworld/blankbody)
|
||||||
faction = list("nether")
|
faction = list("nether")
|
||||||
|
|
||||||
/obj/structure/spawner/nether/Initialize()
|
/mob/living/simple_animal/hostile/spawner/nether/Initialize()
|
||||||
.=..()
|
.=..()
|
||||||
START_PROCESSING(SSprocessing, src)
|
START_PROCESSING(SSprocessing, src)
|
||||||
|
|
||||||
/obj/structure/spawner/nether/examine(mob/user)
|
/mob/living/simple_animal/hostile/spawner/nether/examine(mob/user)
|
||||||
..()
|
..()
|
||||||
if(isskeleton(user))
|
if(isskeleton(user))
|
||||||
to_chat(user, "A direct link to another dimension full of creatures very happy to see you. <span class='nicegreen'>You can see your house from here!</span>")
|
to_chat(user, "A direct link to another dimension full of creatures very happy to see you. <span class='nicegreen'>You can see your house from here!</span>")
|
||||||
else
|
else
|
||||||
to_chat(user, "A direct link to another dimension full of creatures not very happy to see you. <span class='warning'>Entering the link would be a very bad idea.</span>")
|
to_chat(user, "A direct link to another dimension full of creatures not very happy to see you. <span class='warning'>Entering the link would be a very bad idea.</span>")
|
||||||
|
|
||||||
/obj/structure/spawner/nether/attack_hand(mob/user)
|
/mob/living/simple_animal/hostile/spawner/nether/attack_hand(mob/user)
|
||||||
. = ..()
|
. = ..()
|
||||||
if(isskeleton(user))
|
if(isskeleton(user))
|
||||||
to_chat(user, "<span class='notice'>You don't feel like going home yet...</span>")
|
to_chat(user, "<span class='notice'>You don't feel like going home yet...</span>")
|
||||||
@@ -96,7 +96,7 @@
|
|||||||
"<span class='userdanger'>Touching the portal, you are quickly pulled through into a world of unimaginable horror!</span>")
|
"<span class='userdanger'>Touching the portal, you are quickly pulled through into a world of unimaginable horror!</span>")
|
||||||
contents.Add(user)
|
contents.Add(user)
|
||||||
|
|
||||||
/obj/structure/spawner/nether/process()
|
/mob/living/simple_animal/hostile/spawner/nether/process()
|
||||||
for(var/mob/living/M in contents)
|
for(var/mob/living/M in contents)
|
||||||
if(M)
|
if(M)
|
||||||
playsound(src, 'sound/magic/demon_consume.ogg', 50, 1)
|
playsound(src, 'sound/magic/demon_consume.ogg', 50, 1)
|
||||||
|
|||||||
@@ -1,6 +1,6 @@
|
|||||||
/datum/nano_module
|
/datum/nano_module
|
||||||
var/name
|
var/name
|
||||||
var/host
|
var/datum/host
|
||||||
|
|
||||||
/datum/nano_module/New(var/host)
|
/datum/nano_module/New(var/host)
|
||||||
src.host = host
|
src.host = host
|
||||||
@@ -8,5 +8,9 @@
|
|||||||
/datum/nano_module/nano_host()
|
/datum/nano_module/nano_host()
|
||||||
return host ? host : src
|
return host ? host : src
|
||||||
|
|
||||||
|
/datum/nano_module/on_ui_close(mob/user)
|
||||||
|
if(host)
|
||||||
|
host.on_ui_close(user)
|
||||||
|
|
||||||
/datum/nano_module/proc/can_still_topic(var/datum/topic_state/state = default_state)
|
/datum/nano_module/proc/can_still_topic(var/datum/topic_state/state = default_state)
|
||||||
return CanUseTopic(usr, state) == STATUS_INTERACTIVE
|
return CanUseTopic(usr, state) == STATUS_INTERACTIVE
|
||||||
|
|||||||
@@ -220,6 +220,7 @@
|
|||||||
icon_state = "water_cooler"
|
icon_state = "water_cooler"
|
||||||
anchored = 1
|
anchored = 1
|
||||||
tank_volume = 500
|
tank_volume = 500
|
||||||
|
reagent_id = "water"
|
||||||
var/paper_cups = 25 //Paper cups left from the cooler
|
var/paper_cups = 25 //Paper cups left from the cooler
|
||||||
|
|
||||||
/obj/structure/reagent_dispensers/water_cooler/examine(mob/user)
|
/obj/structure/reagent_dispensers/water_cooler/examine(mob/user)
|
||||||
|
|||||||
@@ -75,6 +75,10 @@
|
|||||||
climbable = TRUE
|
climbable = TRUE
|
||||||
max_integrity = 100
|
max_integrity = 100
|
||||||
can_deconstruct = TRUE
|
can_deconstruct = TRUE
|
||||||
|
anchored = TRUE
|
||||||
|
density = TRUE
|
||||||
|
unacidable = TRUE
|
||||||
|
resistance_flags = FIRE_PROOF
|
||||||
desc = "A massive brass gear. You could probably secure or unsecure it with a wrench, or just climb over it."
|
desc = "A massive brass gear. You could probably secure or unsecure it with a wrench, or just climb over it."
|
||||||
|
|
||||||
/obj/structure/clockwork/wall_gear/displaced
|
/obj/structure/clockwork/wall_gear/displaced
|
||||||
@@ -227,7 +231,7 @@
|
|||||||
icon_state = "fallen_armor"
|
icon_state = "fallen_armor"
|
||||||
w_class = WEIGHT_CLASS_NORMAL
|
w_class = WEIGHT_CLASS_NORMAL
|
||||||
|
|
||||||
//Ratvarian spear: A relatively fragile spear from the Celestial Derelict. Deals extreme damage to silicons and enemy cultists, but doesn't last long when summoned.
|
//Ratvarian spear
|
||||||
/obj/item/clockwork/weapon/ratvarian_spear
|
/obj/item/clockwork/weapon/ratvarian_spear
|
||||||
name = "ratvarian spear"
|
name = "ratvarian spear"
|
||||||
desc = "A razor-sharp spear made of brass. It thrums with barely-contained energy."
|
desc = "A razor-sharp spear made of brass. It thrums with barely-contained energy."
|
||||||
|
|||||||
@@ -4,4 +4,8 @@
|
|||||||
/obj/item/pizzabox/meat = 3,
|
/obj/item/pizzabox/meat = 3,
|
||||||
/obj/item/pizzabox/mushroom = 3,
|
/obj/item/pizzabox/mushroom = 3,
|
||||||
/obj/item/pizza_bomb = 1)
|
/obj/item/pizza_bomb = 1)
|
||||||
lootdoubles = FALSE
|
lootdoubles = FALSE
|
||||||
|
|
||||||
|
/obj/structure/reagent_dispensers/water_cooler/pizzaparty
|
||||||
|
name = "punch cooler"
|
||||||
|
reagent_id = "bacchus_blessing"
|
||||||
Reference in New Issue
Block a user