shikix/GS13NG
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Made some object lists less terrible to read

Browse Source
This commit is contained in:
CitadelStationBot
2017-07-18 09:44:43 -05:00
parent c294d781b6
commit a72962c300
236 changed files with 733 additions and 629 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/modules/station_goals/bsa.dm
+6 -6
View File
@@ -73,11 +73,11 @@
if(istype(W, /obj/item/device/multitool))
var/obj/item/device/multitool/M = W
if(M.buffer)
if(istype(M.buffer,/obj/machinery/bsa/back))
if(istype(M.buffer, /obj/machinery/bsa/back))
back = M.buffer
M.buffer = null
to_chat(user, "<span class='notice'>You link [src] with [back].</span>")
else if(istype(M.buffer,/obj/machinery/bsa/front))
else if(istype(M.buffer, /obj/machinery/bsa/front))
front = M.buffer
M.buffer = null
to_chat(user, "<span class='notice'>You link [src] with [front].</span>")
@@ -291,17 +291,17 @@
/obj/machinery/computer/bsa_control/proc/get_target_name()
if(istype(target,/area))
if(istype(target, /area))
var/area/A = target
return A.name
else if(istype(target,/obj/item/device/gps))
else if(istype(target, /obj/item/device/gps))
var/obj/item/device/gps/G = target
return G.gpstag
/obj/machinery/computer/bsa_control/proc/get_impact_turf()
if(istype(target,/area))
if(istype(target, /area))
return pick(get_area_turfs(target))
else if(istype(target,/obj/item/device/gps))
else if(istype(target, /obj/item/device/gps))
return get_turf(target)
/obj/machinery/computer/bsa_control/proc/fire(mob/user)
code/modules/station_goals/dna_vault.dm
+2 -2
View File
@@ -80,7 +80,7 @@
if(!proximity || !target)
return
//tray plants
if(istype(target,/obj/machinery/hydroponics))
if(istype(target, /obj/machinery/hydroponics))
var/obj/machinery/hydroponics/H = target
if(!H.myseed)
return
@@ -94,7 +94,7 @@
to_chat(user, "<span class='notice'>Plant data added to local storage.<span>")
//animals
var/static/list/non_simple_animals = typecacheof(list(/mob/living/carbon/monkey,/mob/living/carbon/alien))
var/static/list/non_simple_animals = typecacheof(list(/mob/living/carbon/monkey, /mob/living/carbon/alien))
if(isanimal(target) || is_type_in_typecache(target,non_simple_animals))
if(isanimal(target))
var/mob/living/simple_animal/A = target