Let's not edit the old one

This commit is contained in:
VerySoft
2021-06-20 06:19:16 -04:00
parent 396032999b
commit 8657f21c47
9 changed files with 22515 additions and 9 deletions
+34 -1
View File
@@ -26,4 +26,37 @@
icon_base = "grass-dark"
/turf/simulated/floor/tiled/freezer/cold
temperature = T0C - 5
temperature = T0C - 5
/turf/simulated/floor/redgrid
name = "processing strata"
icon = 'icons/turf/flooring/circuit_vr.dmi'
icon_state = "rcircuit"
initial_flooring = /decl/flooring/reinforced/circuit/red
/decl/flooring/reinforced/circuit/red
name = "processing strata"
icon = 'icons/turf/flooring/circuit_vr.dmi'
icon_base = "rcircuit"
/turf/simulated/floor/redgrid/animated
name = "pulsing pattern"
icon = 'icons/turf/flooring/circuit_vr.dmi'
icon_state = "rcircuitanim"
initial_flooring = /decl/flooring/reinforced/circuit/red/animated
/decl/flooring/reinforced/circuit/red/animated
name = "pulsing pattern"
icon = 'icons/turf/flooring/circuit_vr.dmi'
icon_base = "rcircuitanim"
/turf/simulated/floor/redgrid/off
name = "dark pattern"
icon = 'icons/turf/flooring/circuit_vr.dmi'
icon_state = "rcircuitanim_broken"
initial_flooring = /decl/flooring/reinforced/circuit/red/off
/decl/flooring/reinforced/circuit/red/off
name = "dark pattern"
icon = 'icons/turf/flooring/circuit_vr.dmi'
icon_base = "rcircuitanim_broken"
@@ -0,0 +1,45 @@
/turf/simulated/floor/outdoors/ironsand
name = "iron sand"
desc = "Red and gritty."
icon = 'icons/turf/flooring/ironsand_vr.dmi'
icon_state = "ironsand1"
edge_blending_priority = 1
initial_flooring = /decl/flooring/outdoors/ironsand
/decl/flooring/outdoors/ironsand
name = "iron sand"
desc = "Red and gritty."
icon = 'icons/turf/flooring/ironsand_vr.dmi'
icon_base = "ironsand1"
footstep_sounds = list("human" = list(
'sound/effects/footstep/asteroid1.ogg',
'sound/effects/footstep/asteroid2.ogg',
'sound/effects/footstep/asteroid3.ogg',
'sound/effects/footstep/asteroid4.ogg',
'sound/effects/footstep/asteroid5.ogg',
'sound/effects/footstep/MedDirt1.ogg',
'sound/effects/footstep/MedDirt2.ogg',
'sound/effects/footstep/MedDirt3.ogg',
'sound/effects/footstep/MedDirt4.ogg'))
/turf/simulated/floor/outdoors/ironsand/Initialize(mapload)
var/possiblesands = list(
"ironsand1" = 50,
"ironsand2" = 1,
"ironsand3" = 1,
"ironsand4" = 1,
"ironsand5" = 1,
"ironsand6" = 1,
"ironsand7" = 1,
"ironsand8" = 1,
"ironsand9" = 1,
"ironsand10" = 1,
"ironsand11" = 1,
"ironsand12" = 1,
"ironsand13" = 1,
"ironsand14" = 1,
"ironsand15" = 1
)
flooring_override = pickweight(possiblesands)
return ..()
Binary file not shown.

After

Width:  |  Height:  |  Size: 1.9 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 2.0 KiB

+187
View File
@@ -0,0 +1,187 @@
/* Code for the Wild West map by Brotemis
* Contains:
* Wish Granter
* Meat Grinder
*/
/*
* Wish Granter
*/
//I copied this from the archive thingy for in case it goes missing. I would like to spice up the wish granter with some new, more appropriate stuff eventually
//At present neither of these things are on the map.
/*
/obj/machinery/wish_granter_dark
name = "Wish Granter"
desc = "You're not so sure about this, anymore..."
icon = 'icons/obj/device.dmi'
icon_state = "syndbeacon"
anchored = 1
density = 1
use_power = USE_POWER_OFF
var/chargesa = 1
var/insistinga = 0
/obj/machinery/wish_granter_dark/attack_hand(var/mob/living/carbon/human/user as mob)
usr.set_machine(src)
if(chargesa <= 0)
to_chat(user, "The Wish Granter lies silent.")
return
else if(!istype(user, /mob/living/carbon/human))
to_chat(user, "You feel a dark stirring inside of the Wish Granter, something you want nothing of. Your instincts are better than any man's.")
return
else if(is_special_character(user))
to_chat(user, "Even to a heart as dark as yours, you know nothing good will come of this. Something instinctual makes you pull away.")
else if (!insistinga)
to_chat(user, "Your first touch makes the Wish Granter stir, listening to you. Are you really sure you want to do this?")
insistinga++
else
chargesa--
insistinga = 0
var/wish = input("You want...","Wish") as null|anything in list("Power","Wealth","Immortality","To Kill","Peace")
switch(wish)
if("Power")
to_chat(user, "<B>Your wish is granted, but at a terrible cost...</B>")
to_chat(user, "The Wish Granter punishes you for your selfishness, claiming your soul and warping your body to match the darkness in your heart.")
if (!(LASER in user.mutations))
user.mutations.Add(LASER)
to_chat(user, "<span class='notice'>You feel pressure building behind your eyes.</span>")
if (!(COLD_RESISTANCE in user.mutations))
user.mutations.Add(COLD_RESISTANCE)
to_chat(user, "<span class='notice'>Your body feels warm.</span>")
if (!(XRAY in user.mutations))
user.mutations.Add(XRAY)
user.sight |= (SEE_MOBS|SEE_OBJS|SEE_TURFS)
user.see_in_dark = 8
user.see_invisible = SEE_INVISIBLE_LEVEL_TWO
to_chat(user, "<span class='notice'>The walls suddenly disappear.</span>")
user.dna.mutantrace = "shadow"
user.update_mutantrace()
if("Wealth")
to_chat(user, "<B>Your wish is granted, but at a terrible cost...</B>")
to_chat(user, "The Wish Granter punishes you for your selfishness, claiming your soul and warping your body to match the darkness in your heart.")
new /obj/structure/closet/syndicate/resources/everything(loc)
user.dna.mutantrace = "shadow"
user.update_mutantrace()
if("Immortality")
to_chat(user, "<B>Your wish is granted, but at a terrible cost...</B>")
to_chat(user, "The Wish Granter punishes you for your selfishness, claiming your soul and warping your body to match the darkness in your heart.")
user.verbs += /mob/living/carbon/proc/immortality
user.dna.mutantrace = "shadow"
user.update_mutantrace()
if("To Kill")
to_chat(user, "<B>Your wish is granted, but at a terrible cost...</B>")
to_chat(user, "The Wish Granter punishes you for your wickedness, claiming your soul and warping your body to match the darkness in your heart.")
ticker.mode.traitors += user.mind
user.mind.special_role = "traitor"
var/datum/objective/hijack/hijack = new
hijack.owner = user.mind
user.mind.objectives += hijack
to_chat(user, "<B>Your inhibitions are swept away, the bonds of loyalty broken, you are free to murder as you please!</B>")
var/obj_count = 1
for(var/datum/objective/OBJ in user.mind.objectives)
to_chat(user, "<B>Objective #[obj_count]</B>: [OBJ.explanation_text]")
obj_count++
user.dna.mutantrace = "shadow"
user.update_mutantrace()
if("Peace")
to_chat(user, "<B>Whatever alien sentience that the Wish Granter possesses is satisfied with your wish. There is a distant wailing as the last of the Faithless begin to die, then silence.</B>")
to_chat(user, "You feel as if you just narrowly avoided a terrible fate...")
for(var/mob/living/simple_mob/faithless/F in living_mob_list)
F.health = -10
F.set_stat(DEAD)
F.icon_state = "faithless_dead"
///////////////Meatgrinder//////////////
/obj/effect/meatgrinder
name = "Meat Grinder"
desc = "What is that thing?"
density = 1
anchored = 1
icon = 'icons/mob/critter.dmi'
icon_state = "blob"
var/triggerproc = "explode" //name of the proc thats called when the mine is triggered
var/triggered = 0
/obj/effect/meatgrinder/New()
icon_state = "blob"
/obj/effect/meatgrinder/HasEntered(AM as mob|obj)
Bumped(AM)
/obj/effect/meatgrinder/Bumped(mob/M as mob|obj)
if(triggered) return
if(istype(M, /mob/living/carbon/human) || istype(M, /mob/living/carbon/monkey))
for(var/mob/O in viewers(world.view, src.loc))
to_chat(O, "<font color='red'>[M] triggered the [bicon(src)] [src]</font>")
triggered = 1
call(src,triggerproc)(M)
/obj/effect/meatgrinder/proc/triggerrad1(mob)
var/datum/effect/effect/system/spark_spread/s = new /datum/effect/effect/system/spark_spread
for(var/mob/O in viewers(world.view, src.loc))
s.set_up(3, 1, src)
s.start()
explosion(mob, 1, 0, 0, 0)
spawn(0)
qdel(src)
/obj/effect/meatgrinder
name = "Meat Grinder"
icon_state = "blob"
triggerproc = "triggerrad1"
/////For the Wishgranter///////////
/mob/living/carbon/proc/immortality()
set category = "Immortality"
set name = "Resurrection"
var/mob/living/carbon/C = usr
if(!C.stat)
to_chat(C, "<span class='notice'>You're not dead yet!</span>")
return
to_chat(C, "<span class='notice'>Death is not your end!</span>")
spawn(rand(800,1200))
if(C.stat == DEAD)
dead_mob_list -= C
living_mob_list += C
C.set_stat(CONSCIOUS)
C.tod = null
C.setToxLoss(0)
C.setOxyLoss(0)
C.setCloneLoss(0)
C.SetParalysis(0)
C.SetStunned(0)
C.SetWeakened(0)
C.radiation = 0
C.heal_overall_damage(C.getBruteLoss(), C.getFireLoss())
C.reagents.clear_reagents()
to_chat(C, "<span class='notice'>You have regenerated.</span>")
C.visible_message("<span class='warning'>[usr] appears to wake from the dead, having healed all wounds.</span>")
C.update_canmove()
return 1
*/
/obj/effect/overmap/visitable/sector/tether_gateway/wildwest
name = "redspace shimmer"
desc = "The shimmering reflection of some sort of redspace phenomena."
scanner_desc = @{"It is difficult to tell just what is beyond this strange shimmering shape. The air beyond seems breathable."}
icon = 'icons/obj/overmap_vr.dmi'
icon_state = "shimmer"
color = "#8b0b0b" //red
in_space = 1
File diff suppressed because it is too large Load Diff
+7
View File
@@ -355,6 +355,13 @@
mappath = 'maps/gateway_vr/eggnogtownunderground.dmm'
associated_map_datum = /datum/map_z_level/tether_lateload/gateway_destination
#include "../../gateway_vr/wildwest.dm"
/datum/map_template/tether_lateload/gateway/wildwest
name = "Wild West"
desc = "A classic."
mappath = 'maps/gateway_vr/wildwest.dmm'
associated_map_datum = /datum/map_z_level/tether_lateload/gateway_destination
//////////////////////////////////////////////////////////////////////////////////////
// Admin-use z-levels for loading whenever an admin feels like
#if AWAY_MISSION_TEST
+9 -8
View File
@@ -164,14 +164,15 @@
)
lateload_single_pick = list(
list("Carp Farm"),
list("Snow Field"),
list("Listening Post"),
list("Honleth Highlands A"),
list("Honleth Highlands B"),
list("Arynthi Lake Underground A","Arynthi Lake A"),
list("Arynthi Lake Underground B","Arynthi Lake B"),
list("Eggnog Town Underground","Eggnog Town")
// list("Carp Farm"),
// list("Snow Field"),
// list("Listening Post"),
// list("Honleth Highlands A"),
// list("Honleth Highlands B"),
// list("Arynthi Lake Underground A","Arynthi Lake A"),
// list("Arynthi Lake Underground B","Arynthi Lake B"),
// list("Eggnog Town Underground","Eggnog Town"),
list("Wild West")
)
ai_shell_restricted = TRUE
+1
View File
@@ -1593,6 +1593,7 @@
#include "code\game\turfs\simulated\outdoors\atmoscaves_vr.dm"
#include "code\game\turfs\simulated\outdoors\dirt.dm"
#include "code\game\turfs\simulated\outdoors\grass.dm"
#include "code\game\turfs\simulated\outdoors\ironsand_vr.dm"
#include "code\game\turfs\simulated\outdoors\outdoors.dm"
#include "code\game\turfs\simulated\outdoors\outdoors_attackby.dm"
#include "code\game\turfs\simulated\outdoors\outdoors_vr.dm"