diff --git a/baystation12.dme b/baystation12.dme index 287719919b..6aff3b7d65 100644 --- a/baystation12.dme +++ b/baystation12.dme @@ -1266,10 +1266,6 @@ #include "code\modules\surgery\ribcage.dm" #include "code\modules\surgery\robolimbs.dm" #include "code\modules\surgery\surgery.dm" -#include "code\modules\telesci\bscrystal.dm" -#include "code\modules\telesci\gps.dm" -#include "code\modules\telesci\telepad.dm" -#include "code\modules\telesci\telesci_computer.dm" #include "code\modules\virus2\analyser.dm" #include "code\modules\virus2\antibodies.dm" #include "code\modules\virus2\centrifuge.dm" diff --git a/code/TriDimension/Turfs.dm b/code/TriDimension/Turfs.dm index 94114c9a9e..ae7bf8202e 100644 --- a/code/TriDimension/Turfs.dm +++ b/code/TriDimension/Turfs.dm @@ -53,6 +53,13 @@ H:updatehealth() return ..() +/turf/proc/hasbelow() + var/turf/controllerlocation = locate(1, 1, z) + for(var/obj/effect/landmark/zcontroller/controller in controllerlocation) + if(controller.down) + return 1 + return 0 + /turf/simulated/floor/open/proc/getbelow() var/turf/controllerlocation = locate(1, 1, z) for(var/obj/effect/landmark/zcontroller/controller in controllerlocation) @@ -73,7 +80,7 @@ //overwrite the attackby of space to transform it to openspace if necessary /turf/space/attackby(obj/item/C as obj, mob/user as mob) - if (istype(C, /obj/item/weapon/cable_coil)) + if (istype(C, /obj/item/weapon/cable_coil) && src.hasbelow()) var/turf/simulated/floor/open/W = src.ChangeTurf(/turf/simulated/floor/open) W.attackby(C, user) return diff --git a/code/controllers/configuration.dm b/code/controllers/configuration.dm index 4a1f519bc8..71d6e9025c 100644 --- a/code/controllers/configuration.dm +++ b/code/controllers/configuration.dm @@ -481,7 +481,7 @@ config.cult_ghostwriter = 1 if("req_cult_ghostwriter") - config.cult_ghostwriter_req_cultists = value + config.cult_ghostwriter_req_cultists = text2num(value) else log_misc("Unknown setting in configuration: '[name]'") diff --git a/code/controllers/master_controller.dm b/code/controllers/master_controller.dm index 28b875d0b7..34b4a045f7 100644 --- a/code/controllers/master_controller.dm +++ b/code/controllers/master_controller.dm @@ -254,6 +254,10 @@ datum/controller/game_controller/proc/process_diseases() active_diseases.Cut(i,i+1) datum/controller/game_controller/proc/process_machines() + process_machines_process() + process_machines_power() + process_machines_rebuild() +datum/controller/game_controller/proc/process_machines_process() var/i = 1 while(i<=machines.len) var/obj/machinery/Machine = machines[i] @@ -265,7 +269,8 @@ datum/controller/game_controller/proc/process_machines() continue machines.Cut(i,i+1) - i=1 +datum/controller/game_controller/proc/process_machines_power() + var/i=1 while(i<=active_areas.len) var/area/A = active_areas[i] if(A.powerupdate && A.master == A) @@ -283,15 +288,13 @@ datum/controller/game_controller/proc/process_machines() A.powerupdate = 0 active_areas.Cut(i,i+1) - +datum/controller/game_controller/proc/process_machines_rebuild() if(controller_iteration % 150 == 0 || rebuild_active_areas) //Every 300 seconds we retest every area/machine for(var/area/A in all_areas) if(A == A.master) A.powerupdate += 1 active_areas |= A rebuild_active_areas = 0 - - datum/controller/game_controller/proc/process_objects() diff --git a/code/datums/spells/horsemask.dm b/code/datums/spells/horsemask.dm index f3ecc12151..2ea66dac57 100644 --- a/code/datums/spells/horsemask.dm +++ b/code/datums/spells/horsemask.dm @@ -28,12 +28,23 @@ user << "They are too far away!" return - var/obj/item/clothing/mask/horsehead/magichead = new /obj/item/clothing/mask/horsehead - magichead.canremove = 0 //curses! - magichead.flags_inv = null //so you can still see their face - magichead.voicechange = 1 //NEEEEIIGHH + var/obj/item/clothing/mask/horsehead/magic/magichead = new /obj/item/clothing/mask/horsehead/magic target.visible_message( "[target]'s face lights up in fire, and after the event a horse's head takes its place!", \ "Your face burns up, and shortly after the fire you realise you have the face of a horse!") target.equip_to_slot(magichead, slot_wear_mask) flick("e_flash", target.flash) + +//item used by the horsehead spell +/obj/item/clothing/mask/horsehead/magic + //flags_inv = null //so you can still see their face... no. How can you recognize someone when their face is completely different? + voicechange = 1 //NEEEEIIGHH + + dropped(mob/user as mob) + canremove = 1 + ..() + + equipped(var/mob/user, var/slot) + if (slot == slot_wear_mask) + canremove = 0 //curses! + ..() diff --git a/code/game/area/Space Station 13 areas.dm b/code/game/area/Space Station 13 areas.dm index aa84c7d943..c0f316dc6c 100755 --- a/code/game/area/Space Station 13 areas.dm +++ b/code/game/area/Space Station 13 areas.dm @@ -1381,12 +1381,8 @@ var/list/ghostteleportlocs = list() /area/rnd/misc_lab name = "\improper Miscellaneous Research" icon_state = "toxmisc" - -/area/rnd/telesci - name = "\improper Telescience Lab" - icon_state = "toxmisc" - -/area/rnd/server + +/area/toxins/server name = "\improper Server Room" icon_state = "server" diff --git a/code/game/machinery/bees_items.dm b/code/game/machinery/bees_items.dm index 01ed5bfa40..e02a0a1a23 100644 --- a/code/game/machinery/bees_items.dm +++ b/code/game/machinery/bees_items.dm @@ -102,21 +102,22 @@ h1 {font-size: 18px; margin: 15px 0px 5px;} h2 {font-size: 15px; margin: 15px 0px 5px;} li {margin: 2px 0px 2px 15px;} - ul {list-style: none; margin: 5px; padding: 0px;} + ul {margin: 5px; padding: 0px;} ol {margin: 5px; padding: 0px 15px;} + body {font-size: 13px; font-family: Verdana;}
-