mirror of
https://github.com/CHOMPStation2/CHOMPStation2.git
synced 2025-12-10 18:22:39 +00:00
Makes the code compile.
This commit is contained in:
@@ -96,6 +96,8 @@ var/list/gamemode_cache = list()
|
|||||||
var/wikiurl
|
var/wikiurl
|
||||||
var/forumurl
|
var/forumurl
|
||||||
var/githuburl
|
var/githuburl
|
||||||
|
var/rulesurl
|
||||||
|
|
||||||
//Alert level description
|
//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_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."
|
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."
|
||||||
|
|||||||
@@ -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/holopad_area = get_area(src)
|
||||||
var/area/hologram_area = get_area(H)
|
var/area/hologram_area = get_area(H)
|
||||||
|
|
||||||
if(!(hologram_area in holopad_area.master.related))
|
if(!(hologram_area in holopad_area))
|
||||||
clear_holo(user)
|
clear_holo(user)
|
||||||
|
|
||||||
return 1
|
return 1
|
||||||
|
|||||||
@@ -122,8 +122,7 @@
|
|||||||
if(F.check_destroy_override(F))
|
if(F.check_destroy_override(F))
|
||||||
build_turf = deconstruct ? destroy_floor_override_path : /turf/simulated/wall
|
build_turf = deconstruct ? destroy_floor_override_path : /turf/simulated/wall
|
||||||
else
|
else
|
||||||
build_turf = deconstruct ? /turf/space : /turf/simulated/wall else
|
build_turf = deconstruct ? /turf/space : /turf/simulated/wall
|
||||||
return 0
|
|
||||||
|
|
||||||
if(!build_type)
|
if(!build_type)
|
||||||
working = 0
|
working = 0
|
||||||
|
|||||||
@@ -27,9 +27,10 @@
|
|||||||
for(var/obj/effect/O in src)
|
for(var/obj/effect/O in src)
|
||||||
if(istype(O,/obj/effect/rune) || istype(O,/obj/effect/decal/cleanable) || istype(O,/obj/effect/overlay))
|
if(istype(O,/obj/effect/rune) || istype(O,/obj/effect/decal/cleanable) || istype(O,/obj/effect/overlay))
|
||||||
del(O)
|
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.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
|
source.reagents.remove_any(1) //reaction() doesn't use up the reagents
|
||||||
|
*/
|
||||||
/obj/item/weapon/mop_deploy/afterattack(atom/A, mob/user, proximity)
|
/obj/item/weapon/mop_deploy/afterattack(atom/A, mob/user, proximity)
|
||||||
if(!proximity) return
|
if(!proximity) return
|
||||||
if(istype(A, /turf) || istype(A, /obj/effect/decal/cleanable) || istype(A, /obj/effect/overlay) || istype(A, /obj/effect/rune))
|
if(istype(A, /turf) || istype(A, /obj/effect/decal/cleanable) || istype(A, /obj/effect/overlay) || istype(A, /obj/effect/rune))
|
||||||
|
|||||||
@@ -23,7 +23,7 @@
|
|||||||
/turf/simulated/proc/check_destroy_override()
|
/turf/simulated/proc/check_destroy_override()
|
||||||
if(destroy_floor_override) //Don't bother doing the additional checks if we don't have to.
|
if(destroy_floor_override) //Don't bother doing the additional checks if we don't have to.
|
||||||
var/area/my_area = get_area(src)
|
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))
|
if(is_type_in_list(my_area, destroy_floor_override_ignore_areas))
|
||||||
return 0
|
return 0
|
||||||
if(z in destroy_floor_override_z_levels)
|
if(z in destroy_floor_override_z_levels)
|
||||||
|
|||||||
@@ -85,24 +85,31 @@ var/list/wood_icons = list("wood","wood-broken")
|
|||||||
if(check_destroy_override())
|
if(check_destroy_override())
|
||||||
src.ChangeTurf(destroy_floor_override_path)
|
src.ChangeTurf(destroy_floor_override_path)
|
||||||
else
|
else
|
||||||
src.ChangeTurf(/turf/space) if(2.0)
|
src.ChangeTurf(/turf/space)
|
||||||
|
if(2.0)
|
||||||
switch(pick(1,2;75,3))
|
switch(pick(1,2;75,3))
|
||||||
if (1)
|
if (1)
|
||||||
if(check_destroy_override())
|
if(check_destroy_override())
|
||||||
src.ChangeTurf(destroy_floor_override_path)
|
src.ChangeTurf(destroy_floor_override_path)
|
||||||
else
|
else
|
||||||
src.ReplaceWithLattice()
|
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())
|
if(check_destroy_override())
|
||||||
src.ChangeTurf(destroy_floor_override_path)
|
src.ChangeTurf(destroy_floor_override_path)
|
||||||
else
|
else
|
||||||
src.ChangeTurf(/turf/space) if(3)
|
src.ChangeTurf(/turf/space)
|
||||||
if(prob(33)) new /obj/item/stack/material/steel(src) if(prob(80))
|
if(3)
|
||||||
|
if(prob(33))
|
||||||
|
new /obj/item/stack/material/steel(src)
|
||||||
|
if(prob(80))
|
||||||
src.break_tile_to_plating()
|
src.break_tile_to_plating()
|
||||||
else
|
else
|
||||||
src.break_tile()
|
src.break_tile()
|
||||||
src.hotspot_expose(1000,CELL_VOLUME)
|
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(3.0)
|
||||||
if (prob(50))
|
if (prob(50))
|
||||||
src.break_tile()
|
src.break_tile()
|
||||||
|
|||||||
@@ -182,7 +182,7 @@ var/list/global/wall_cache = list()
|
|||||||
if(check_destroy_override())
|
if(check_destroy_override())
|
||||||
src.ChangeTurf(destroy_floor_override_path)
|
src.ChangeTurf(destroy_floor_override_path)
|
||||||
else
|
else
|
||||||
src.ChangeTurf(/turf/space) return
|
src.ChangeTurf(/turf/space)
|
||||||
if(2.0)
|
if(2.0)
|
||||||
if(prob(75))
|
if(prob(75))
|
||||||
take_damage(rand(150, 250))
|
take_damage(rand(150, 250))
|
||||||
@@ -191,7 +191,7 @@ var/list/global/wall_cache = list()
|
|||||||
if(3.0)
|
if(3.0)
|
||||||
take_damage(rand(0, 250))
|
take_damage(rand(0, 250))
|
||||||
else
|
else
|
||||||
return
|
return
|
||||||
|
|
||||||
/turf/simulated/wall/blob_act()
|
/turf/simulated/wall/blob_act()
|
||||||
take_damage(rand(75, 125))
|
take_damage(rand(75, 125))
|
||||||
|
|||||||
@@ -60,7 +60,8 @@ var/list/ai_verbs_default = list(
|
|||||||
var/datum/trackable/track = null
|
var/datum/trackable/track = null
|
||||||
var/last_announcement = ""
|
var/last_announcement = ""
|
||||||
var/control_disabled = 0
|
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.
|
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
|
//NEWMALF VARIABLES
|
||||||
var/malfunctioning = 0 // Master var that determines if AI is malfunctioning.
|
var/malfunctioning = 0 // Master var that determines if AI is malfunctioning.
|
||||||
|
|||||||
@@ -10,7 +10,8 @@
|
|||||||
else
|
else
|
||||||
src << link(config.wikiurl)
|
src << link(config.wikiurl)
|
||||||
else
|
else
|
||||||
src << "<span class='warning'>The wiki URL is not set in the server configuration.</span>" return
|
src << "<span class='warning'>The wiki URL is not set in the server configuration.</span>"
|
||||||
|
return
|
||||||
|
|
||||||
/client/verb/forum()
|
/client/verb/forum()
|
||||||
set name = "forum"
|
set name = "forum"
|
||||||
@@ -21,7 +22,8 @@
|
|||||||
return
|
return
|
||||||
src << link(config.forumurl)
|
src << link(config.forumurl)
|
||||||
else
|
else
|
||||||
src << "<span class='warning'>The forum URL is not set in the server configuration.</span>" return
|
src << "<span class='warning'>The forum URL is not set in the server configuration.</span>"
|
||||||
|
return
|
||||||
|
|
||||||
/client/verb/rules()
|
/client/verb/rules()
|
||||||
set name = "Rules"
|
set name = "Rules"
|
||||||
|
|||||||
Reference in New Issue
Block a user