From e1c69ed8a12f850dd0910918388fcace194b8e28 Mon Sep 17 00:00:00 2001 From: Ren Erthilo Date: Wed, 2 May 2012 21:21:31 +0100 Subject: [PATCH] Commented out metadata and some other non-sensical stuff. --- baystation12.dme | 3 - code/defines/global.dm | 2 +- code/game/asteroid/artifacts.dm | 116 ++++++++++++++++++ code/game/atom_procs.dm | 4 +- code/game/master_controller.dm | 2 +- .../objects/items/weapons/cigs_lighters.dm | 3 +- code/game/turf.dm | 4 +- code/modules/mob/mob.dm | 2 +- code/modules/recycling/disposal.dm | 4 +- config/config.txt | 2 +- html/changelog.html | 1 - 11 files changed, 128 insertions(+), 15 deletions(-) diff --git a/baystation12.dme b/baystation12.dme index fdf1317104d..c3b954a24d7 100644 --- a/baystation12.dme +++ b/baystation12.dme @@ -393,9 +393,6 @@ #include "code\game\area\ai_monitored.dm" #include "code\game\area\areas.dm" #include "code\game\asteroid\artifacts.dm" -#include "code\game\asteroid\asteroid.dm" -#include "code\game\asteroid\device.dm" -#include "code\game\asteroid\turf.dm" #include "code\game\events\Event.dm" #include "code\game\events\EventsMain.dm" #include "code\game\events\EventProcs\black_hole.dm" diff --git a/code/defines/global.dm b/code/defines/global.dm index 37dcd5f139f..1fa0b55e9fe 100644 --- a/code/defines/global.dm +++ b/code/defines/global.dm @@ -12,7 +12,7 @@ var/global defer_powernet_rebuild = 0 // true if net rebuild will be called manually after an event - list/global_map = null + //list/global_map = null //Borked, do not touch. DMTG //list/global_map = list(list(1,5),list(4,3))//an array of map Z levels. //Resulting sector map looks like //|_1_|_4_| diff --git a/code/game/asteroid/artifacts.dm b/code/game/asteroid/artifacts.dm index 3898632d46b..d4f6fe5e87d 100644 --- a/code/game/asteroid/artifacts.dm +++ b/code/game/asteroid/artifacts.dm @@ -113,3 +113,119 @@ var/global/list/spawned_surprises = list() new /obj/item/weapon/card/id/syndicate(src) new /obj/item/clothing/shoes/syndigaloshes(src) return + + +// Copied over from asteroid.dm +var/global/max_secret_rooms = 3 + +proc/make_mining_asteroid_secret(var/size = 5) + var/valid = 0 + var/turf/T = null + var/sanity = 0 + var/list/room = null + var/list/turfs = null + + + turfs = get_area_turfs(/area/mine/unexplored) + + if(!turfs.len) + return 0 + + while(!valid) + valid = 1 + sanity++ + if(sanity > 100) + return 0 + + T=pick(turfs) + if(!T) + return 0 + + var/list/surroundings = list() + + surroundings += range(7, locate(T.x,T.y,T.z)) + surroundings += range(7, locate(T.x+size,T.y,T.z)) + surroundings += range(7, locate(T.x,T.y+size,T.z)) + surroundings += range(7, locate(T.x+size,T.y+size,T.z)) + + if(locate(/area/mine/explored) in surroundings) // +5s are for view range + valid = 0 + continue + + if(locate(/turf/space) in surroundings) + valid = 0 + continue + + if(locate(/area/asteroid/artifactroom) in surroundings) + valid = 0 + continue + + if(locate(/turf/simulated/floor/plating/airless/asteroid) in surroundings) + valid = 0 + continue + + if(!T) + return 0 + + room = spawn_room(T,size,size,,,1) + + if(room) + T = pick(room["floors"]) + if(T) + var/surprise = null + valid = 0 + while(!valid) + surprise = pickweight(space_surprises) + if(surprise in spawned_surprises) + if(prob(20)) + valid++ + else + continue + else + valid++ + + spawned_surprises.Add(surprise) + new surprise(T) + + return 1 + +proc/spawn_room(var/atom/start_loc,var/x_size,var/y_size,var/wall,var/floor , var/clean = 0 , var/name) + var/list/room_turfs = list("walls"=list(),"floors"=list()) + + //world << "Room spawned at [start_loc.x],[start_loc.y],[start_loc.z]" + if(!wall) + wall = pick(/turf/simulated/wall/r_wall,/turf/simulated/wall,/obj/effect/alien/resin) + if(!floor) + floor = pick(/turf/simulated/floor,/turf/simulated/floor/engine) + + for(var/x = 0,x
  • Adds a borg upgrade system. Can be used to reset modules or 'restart' dead cyborgs.
  • Officers can now use huds to modify humans' criminal statuses on the go. To do this, simply examine a human and at the end should be a clickable link to change the status.
  • Cell charger and Recharger are now wrenchable to make them moveable
    • -
  • You can add some metadata to your character which is purley OOC knowledge. Use it for RP preferences, backstories, whatever! Remember that flavour text is part of the IC examine!
  • Cats and Dogs can see in the dark.
  • Changed around a few access levels; only jobs who need to do maintenance have access to maintenance tunnels. Also the heads and detective.
  • Shuttle call/recall announcements are now more noticeable.