From 453ffce5563305ebb31bdc4f06fe1abb74b353ec Mon Sep 17 00:00:00 2001 From: caelaislinn Date: Sat, 19 May 2012 03:22:42 +1000 Subject: [PATCH] added WIP birdmen, tweaked / cleaned up gas turbine gens, tweaked lockdown computers and poddoors. Signed-off-by: caelaislinn --- baystation12.dme | 1 - .../Cael_Aislinn/BirdMan/bird_transformation.dm | 1 + code/WorkInProgress/Cael_Aislinn/BirdMan/birdman.dm | 1 + code/defines/obj/computer.dm | 2 +- code/game/machinery/computer/lockdown.dm | 2 +- code/game/machinery/doors/poddoor.dm | 4 ++-- code/modules/admin/admin_verbs.dm | 2 -- code/modules/power/turbine.dm | 1 + config/admins.txt | 1 - 9 files changed, 7 insertions(+), 8 deletions(-) diff --git a/baystation12.dme b/baystation12.dme index 31aa80de481..e40d1283084 100644 --- a/baystation12.dme +++ b/baystation12.dme @@ -167,7 +167,6 @@ #define FILE_DIR "code/WorkInProgress/Cael_Aislinn/Rust" #define FILE_DIR "code/WorkInProgress/Cael_Aislinn/Supermatter" #define FILE_DIR "code/WorkInProgress/Cael_Aislinn/Tajara" -#define FILE_DIR "code/WorkInProgress/Cael_Aislinn/tajara_sprites" #define FILE_DIR "code/WorkInProgress/Chinsky" #define FILE_DIR "code/WorkInProgress/mapload" #define FILE_DIR "code/WorkInProgress/Mini" diff --git a/code/WorkInProgress/Cael_Aislinn/BirdMan/bird_transformation.dm b/code/WorkInProgress/Cael_Aislinn/BirdMan/bird_transformation.dm index c2697885713..84b66c791f3 100644 --- a/code/WorkInProgress/Cael_Aislinn/BirdMan/bird_transformation.dm +++ b/code/WorkInProgress/Cael_Aislinn/BirdMan/bird_transformation.dm @@ -1,3 +1,4 @@ +//don't use this /mob/living/carbon/human/proc/Birdize() if (monkeyizing) return diff --git a/code/WorkInProgress/Cael_Aislinn/BirdMan/birdman.dm b/code/WorkInProgress/Cael_Aislinn/BirdMan/birdman.dm index 2c199505c43..45206ccc9ee 100644 --- a/code/WorkInProgress/Cael_Aislinn/BirdMan/birdman.dm +++ b/code/WorkInProgress/Cael_Aislinn/BirdMan/birdman.dm @@ -1,4 +1,5 @@ //these are bugged as fuck. dont use them if you like runtimes. +//was testing some icon overlays. might actually fix them up one day /mob/living/carbon/human/birdman name = "birdman" diff --git a/code/defines/obj/computer.dm b/code/defines/obj/computer.dm index 1823d5c7c42..e0822e6c706 100644 --- a/code/defines/obj/computer.dm +++ b/code/defines/obj/computer.dm @@ -128,7 +128,7 @@ icon_state = "lockdown" circuit = "/obj/item/weapon/circuitboard/lockdown" var/connected_doors[0][0] - var/department + var/department //each department has a hardcoded list of possible door networks /obj/machinery/computer/crew name = "Crew monitoring computer" diff --git a/code/game/machinery/computer/lockdown.dm b/code/game/machinery/computer/lockdown.dm index 8c9133a7c61..bbc0f4268a8 100644 --- a/code/game/machinery/computer/lockdown.dm +++ b/code/game/machinery/computer/lockdown.dm @@ -15,8 +15,8 @@ New() ..() - //only load blast doors for map-defined departments for the moment + //door networks are hardcoded here. switch(department) if("Engineering") //Antiqua SinguloEngineering diff --git a/code/game/machinery/doors/poddoor.dm b/code/game/machinery/doors/poddoor.dm index f3958c93677..e94f77cbeeb 100644 --- a/code/game/machinery/doors/poddoor.dm +++ b/code/game/machinery/doors/poddoor.dm @@ -30,7 +30,7 @@ return return -/obj/machinery/door/poddoor/open() +/obj/machinery/door/poddoor/open(var/closeafterdelay = 0) if (src.operating == 1) //doors can still open when emag-disabled return if (!ticker) @@ -46,7 +46,7 @@ if(operating == 1) //emag again src.operating = 0 - if(autoclose) + if(closeafterdelay) spawn(50) autoclose() return 1 diff --git a/code/modules/admin/admin_verbs.dm b/code/modules/admin/admin_verbs.dm index 16068a9c0b7..e9a2e2c6198 100644 --- a/code/modules/admin/admin_verbs.dm +++ b/code/modules/admin/admin_verbs.dm @@ -199,7 +199,6 @@ verbs += /proc/possess verbs += /proc/release verbs += /client/proc/make_tajaran - verbs += /client/proc/make_birdman verbs += /client/proc/admin_deny_shuttle verbs += /client/proc/cmd_admin_christmas verbs += /client/proc/editappear @@ -455,7 +454,6 @@ verbs -= /client/proc/kill_airgroup verbs -= /client/proc/debug_master_controller verbs -= /client/proc/make_tajaran - verbs -= /client/proc/make_birdman verbs -= /client/proc/admin_deny_shuttle verbs -= /client/proc/cmd_admin_christmas verbs -= /client/proc/editappear diff --git a/code/modules/power/turbine.dm b/code/modules/power/turbine.dm index 9a993645c16..b7025d41e63 100644 --- a/code/modules/power/turbine.dm +++ b/code/modules/power/turbine.dm @@ -1,3 +1,4 @@ +//cleaned up the file. might have to tone it down a bit in testing, but we'll see what happens // the inlet stage of the gas turbine electricity generator /obj/machinery/compressor diff --git a/config/admins.txt b/config/admins.txt index fc02f4434be..28ae49f80d3 100644 --- a/config/admins.txt +++ b/config/admins.txt @@ -2,7 +2,6 @@ abi79 - Game Master arcalane - Game Admin bobbehluvspropane - Game Admin cacophony - Game Admin -caelaislinn - Game Master cajoes - Game Admin cib - Game Master compactninja - Game Master