diff --git a/code/controllers/configuration.dm b/code/controllers/configuration.dm index cc51b852b8..7380e709f4 100644 --- a/code/controllers/configuration.dm +++ b/code/controllers/configuration.dm @@ -96,6 +96,8 @@ var/list/gamemode_cache = list() var/wikiurl var/forumurl var/githuburl + var/rulesurl + //Alert level description var/alert_desc_green = "All threats to the station have passed. Security may not have weapons visible, privacy laws are once again fully enforced." var/alert_desc_blue_upto = "The station has received reliable information about possible hostile activity on the station. Security staff may have weapons visible, random searches are permitted." diff --git a/code/game/machinery/hologram.dm b/code/game/machinery/hologram.dm index 8f5e8ac903..8d883a8ddf 100644 --- a/code/game/machinery/hologram.dm +++ b/code/game/machinery/hologram.dm @@ -167,7 +167,7 @@ For the other part of the code, check silicon say.dm. Particularly robot talk.*/ var/area/holopad_area = get_area(src) var/area/hologram_area = get_area(H) - if(!(hologram_area in holopad_area.master.related)) + if(!(hologram_area in holopad_area)) clear_holo(user) return 1 diff --git a/code/game/objects/items/weapons/RCD.dm b/code/game/objects/items/weapons/RCD.dm index b706804f15..0a8e29fc92 100644 --- a/code/game/objects/items/weapons/RCD.dm +++ b/code/game/objects/items/weapons/RCD.dm @@ -122,8 +122,7 @@ if(F.check_destroy_override(F)) build_turf = deconstruct ? destroy_floor_override_path : /turf/simulated/wall else - build_turf = deconstruct ? /turf/space : /turf/simulated/wall else - return 0 + build_turf = deconstruct ? /turf/space : /turf/simulated/wall if(!build_type) working = 0 diff --git a/code/game/objects/items/weapons/mop_deploy.dm b/code/game/objects/items/weapons/mop_deploy.dm index b8eb201b5c..66ae01797e 100644 --- a/code/game/objects/items/weapons/mop_deploy.dm +++ b/code/game/objects/items/weapons/mop_deploy.dm @@ -27,9 +27,10 @@ for(var/obj/effect/O in src) if(istype(O,/obj/effect/rune) || istype(O,/obj/effect/decal/cleanable) || istype(O,/obj/effect/overlay)) del(O) +/* //Reagent code changed at some point and the below doesn't work. To be fixed later. source.reagents.reaction(src, TOUCH, 10) //10 is the multiplier for the reaction effect. probably needed to wet the floor properly. source.reagents.remove_any(1) //reaction() doesn't use up the reagents - +*/ /obj/item/weapon/mop_deploy/afterattack(atom/A, mob/user, proximity) if(!proximity) return if(istype(A, /turf) || istype(A, /obj/effect/decal/cleanable) || istype(A, /obj/effect/overlay) || istype(A, /obj/effect/rune)) diff --git a/code/game/turfs/simulated.dm b/code/game/turfs/simulated.dm index bae9c517c3..655e5466dc 100644 --- a/code/game/turfs/simulated.dm +++ b/code/game/turfs/simulated.dm @@ -23,7 +23,7 @@ /turf/simulated/proc/check_destroy_override() if(destroy_floor_override) //Don't bother doing the additional checks if we don't have to. var/area/my_area = get_area(src) - my_area = my_area.master +// my_area = my_area.master if(is_type_in_list(my_area, destroy_floor_override_ignore_areas)) return 0 if(z in destroy_floor_override_z_levels) diff --git a/code/game/turfs/simulated/floor.dm b/code/game/turfs/simulated/floor.dm index ff4b02c6d4..3ca8d64f6a 100644 --- a/code/game/turfs/simulated/floor.dm +++ b/code/game/turfs/simulated/floor.dm @@ -85,24 +85,31 @@ var/list/wood_icons = list("wood","wood-broken") if(check_destroy_override()) src.ChangeTurf(destroy_floor_override_path) else - src.ChangeTurf(/turf/space) if(2.0) + src.ChangeTurf(/turf/space) + if(2.0) switch(pick(1,2;75,3)) if (1) if(check_destroy_override()) src.ChangeTurf(destroy_floor_override_path) else src.ReplaceWithLattice() - if(prob(33)) new /obj/item/stack/sheet/metal(src) if(2) + if(prob(33)) + new /obj/item/stack/material/steel(src) + if(2) if(check_destroy_override()) src.ChangeTurf(destroy_floor_override_path) else - src.ChangeTurf(/turf/space) if(3) - if(prob(33)) new /obj/item/stack/material/steel(src) if(prob(80)) + src.ChangeTurf(/turf/space) + if(3) + if(prob(33)) + new /obj/item/stack/material/steel(src) + if(prob(80)) src.break_tile_to_plating() else src.break_tile() src.hotspot_expose(1000,CELL_VOLUME) - if(prob(33)) new /obj/item/stack/sheet/metal(src) + if(prob(33)) + new /obj/item/stack/material/steel(src) if(3.0) if (prob(50)) src.break_tile() diff --git a/code/game/turfs/simulated/walls.dm b/code/game/turfs/simulated/walls.dm index 5326c64fe1..794c6bf0f7 100644 --- a/code/game/turfs/simulated/walls.dm +++ b/code/game/turfs/simulated/walls.dm @@ -182,7 +182,7 @@ var/list/global/wall_cache = list() if(check_destroy_override()) src.ChangeTurf(destroy_floor_override_path) else - src.ChangeTurf(/turf/space) return + src.ChangeTurf(/turf/space) if(2.0) if(prob(75)) take_damage(rand(150, 250)) @@ -191,7 +191,7 @@ var/list/global/wall_cache = list() if(3.0) take_damage(rand(0, 250)) else - return + return /turf/simulated/wall/blob_act() take_damage(rand(75, 125)) diff --git a/code/modules/mob/living/silicon/ai/ai.dm b/code/modules/mob/living/silicon/ai/ai.dm index 2d7fdc681e..f0fdf382d1 100644 --- a/code/modules/mob/living/silicon/ai/ai.dm +++ b/code/modules/mob/living/silicon/ai/ai.dm @@ -60,7 +60,8 @@ var/list/ai_verbs_default = list( var/datum/trackable/track = null var/last_announcement = "" var/control_disabled = 0 - var/datum/announcement/priority/announcement var/obj/machinery/ai_powersupply/psupply = null // Backwards reference to AI's powersupply object. + var/datum/announcement/priority/announcement + var/obj/machinery/ai_powersupply/psupply = null // Backwards reference to AI's powersupply object. var/hologram_follow = 1 //This is used for the AI eye, to determine if a holopad's hologram should follow it or not. //NEWMALF VARIABLES var/malfunctioning = 0 // Master var that determines if AI is malfunctioning. diff --git a/interface/interface.dm b/interface/interface.dm index 051fea8170..1e9460d482 100644 --- a/interface/interface.dm +++ b/interface/interface.dm @@ -10,7 +10,8 @@ else src << link(config.wikiurl) else - src << "The wiki URL is not set in the server configuration." return + src << "The wiki URL is not set in the server configuration." + return /client/verb/forum() set name = "forum" @@ -21,7 +22,8 @@ return src << link(config.forumurl) else - src << "The forum URL is not set in the server configuration." return + src << "The forum URL is not set in the server configuration." + return /client/verb/rules() set name = "Rules"