Made some object lists less terrible to read
This commit is contained in:
@@ -32,7 +32,7 @@
|
||||
if(prob(80)) //mid dirt - 1/15
|
||||
return
|
||||
|
||||
if(istype(A, /area/engine) || istype(A, /area/crew_quarters/heads/chief) || istype(A,/area/assembly) || istype(A, /area/science/robotics) || istype(A,/area/maintenance) || istype(A,/area/construction))
|
||||
if(istype(A, /area/engine) || istype(A, /area/crew_quarters/heads/chief) || istype(A, /area/assembly) || istype(A, /area/science/robotics) || istype(A, /area/maintenance) || istype(A, /area/construction))
|
||||
//Blood, sweat, and oil. Oh, and dirt.
|
||||
if(prob(3))
|
||||
new /obj/effect/decal/cleanable/blood/old(src)
|
||||
|
||||
@@ -67,7 +67,7 @@
|
||||
/turf/open/floor/light/attackby(obj/item/C, mob/user, params)
|
||||
if(..())
|
||||
return
|
||||
if(istype(C,/obj/item/weapon/light/bulb)) //only for light tiles
|
||||
if(istype(C, /obj/item/weapon/light/bulb)) //only for light tiles
|
||||
if(state && user.drop_item())
|
||||
qdel(C)
|
||||
state = 0 //fixing it by bashing it with a light bulb, fun eh?
|
||||
|
||||
@@ -53,7 +53,7 @@
|
||||
if(!W.use(1))
|
||||
return
|
||||
var/turf/open/floor/T = ChangeTurf(W.turf_type)
|
||||
if(istype(W,/obj/item/stack/tile/light)) //TODO: get rid of this ugly check somehow
|
||||
if(istype(W, /obj/item/stack/tile/light)) //TODO: get rid of this ugly check somehow
|
||||
var/obj/item/stack/tile/light/L = W
|
||||
var/turf/open/floor/light/F = T
|
||||
F.state = L.state
|
||||
|
||||
@@ -71,7 +71,7 @@
|
||||
gets_dug()
|
||||
SSblackbox.add_details("pick_used_mining","[W.type]")
|
||||
|
||||
if(istype(W,/obj/item/weapon/storage/bag/ore))
|
||||
if(istype(W, /obj/item/weapon/storage/bag/ore))
|
||||
var/obj/item/weapon/storage/bag/ore/S = W
|
||||
if(S.collection_mode == 1)
|
||||
for(var/obj/item/weapon/ore/O in src.contents)
|
||||
@@ -83,7 +83,7 @@
|
||||
if(!Z.use(1))
|
||||
return
|
||||
var/turf/open/floor/T = ChangeTurf(Z.turf_type)
|
||||
if(istype(Z,/obj/item/stack/tile/light)) //TODO: get rid of this ugly check somehow
|
||||
if(istype(Z, /obj/item/stack/tile/light)) //TODO: get rid of this ugly check somehow
|
||||
var/obj/item/stack/tile/light/L = Z
|
||||
var/turf/open/floor/light/F = T
|
||||
F.state = L.state
|
||||
|
||||
@@ -108,12 +108,12 @@
|
||||
return
|
||||
else if(iscyborg(AM))
|
||||
var/mob/living/silicon/robot/R = AM
|
||||
if(istype(R.module_active,/obj/item/weapon/pickaxe))
|
||||
if(istype(R.module_active, /obj/item/weapon/pickaxe))
|
||||
src.attackby(R.module_active,R)
|
||||
return
|
||||
/* else if(istype(AM,/obj/mecha))
|
||||
/* else if(istype(AM, /obj/mecha))
|
||||
var/obj/mecha/M = AM
|
||||
if(istype(M.selected,/obj/item/mecha_parts/mecha_equipment/drill))
|
||||
if(istype(M.selected, /obj/item/mecha_parts/mecha_equipment/drill))
|
||||
src.attackby(M.selected,M)
|
||||
return*/
|
||||
//Aparantly mechs are just TOO COOL to call Collide())
|
||||
|
||||
@@ -122,9 +122,9 @@
|
||||
PlasmaBurn(exposed_temperature)
|
||||
|
||||
/turf/closed/wall/mineral/plasma/bullet_act(var/obj/item/projectile/Proj)
|
||||
if(istype(Proj,/obj/item/projectile/beam))
|
||||
if(istype(Proj, /obj/item/projectile/beam))
|
||||
PlasmaBurn(2500)
|
||||
else if(istype(Proj,/obj/item/projectile/ion))
|
||||
else if(istype(Proj, /obj/item/projectile/ion))
|
||||
PlasmaBurn(500)
|
||||
..()
|
||||
|
||||
|
||||
@@ -106,7 +106,7 @@
|
||||
ChangeTurf(/turf/open/floor/clockwork)
|
||||
|
||||
for(var/obj/O in src) //Eject contents!
|
||||
if(istype(O,/obj/structure/sign/poster))
|
||||
if(istype(O, /obj/structure/sign/poster))
|
||||
var/obj/structure/sign/poster/P = O
|
||||
P.roll_and_drop(src)
|
||||
else
|
||||
|
||||
@@ -52,7 +52,7 @@
|
||||
transfer_fingerprints_to(newgirder)
|
||||
|
||||
for(var/obj/O in src.contents) //Eject contents!
|
||||
if(istype(O,/obj/structure/sign/poster))
|
||||
if(istype(O, /obj/structure/sign/poster))
|
||||
var/obj/structure/sign/poster/P = O
|
||||
P.roll_and_drop(src)
|
||||
|
||||
@@ -167,13 +167,13 @@
|
||||
|
||||
/turf/closed/wall/proc/try_wallmount(obj/item/weapon/W, mob/user, turf/T)
|
||||
//check for wall mounted frames
|
||||
if(istype(W,/obj/item/wallframe))
|
||||
if(istype(W, /obj/item/wallframe))
|
||||
var/obj/item/wallframe/F = W
|
||||
if(F.try_build(src, user))
|
||||
F.attach(src, user)
|
||||
return 1
|
||||
//Poster stuff
|
||||
else if(istype(W,/obj/item/weapon/poster))
|
||||
else if(istype(W, /obj/item/weapon/poster))
|
||||
place_poster(W,user)
|
||||
return 1
|
||||
|
||||
|
||||
Reference in New Issue
Block a user