Surface Map Work (#4557)

* Tweaks Surface, POI system

* More Stuff

* Travis Appeasement

* Fixes invisible banner.
This commit is contained in:
Neerti
2018-01-17 13:46:19 -06:00
committed by Anewbe
parent f2fef6f410
commit 5b54f4c875
65 changed files with 3555 additions and 2997 deletions
+35
View File
@@ -0,0 +1,35 @@
/obj/item/weapon/banner
name = "banner"
icon = 'icons/obj/items.dmi'
icon_state = "banner"
desc = "A banner that's invisible because it shouldn't exist."
/obj/item/weapon/banner/red
name = "red banner"
icon_state = "banner-red"
desc = "A red colored banner."
/obj/item/weapon/banner/blue
name = "blue banner"
icon_state = "banner-blue"
desc = "A blue colored banner."
/obj/item/weapon/banner/green
name = "green banner"
icon_state = "banner-green"
desc = "A green colored banner."
/obj/item/weapon/banner/nt
name = "\improper NanoTrasen banner"
icon_state = "banner-nt"
desc = "A banner with NanoTrasen's logo on it."
/obj/item/weapon/banner/solgov
name = "\improper SolGov banner"
icon_state = "banner-solgov"
desc = "A banner with the symbol of the Solar Confederate Government."
/obj/item/weapon/banner/virgov
name = "\improper VirGov banner"
icon_state = "banner-virgov"
desc = "A banner with the symbol of the local government, the Vir Governmental Authority, also known as SifGov."
@@ -6,7 +6,7 @@
anchored = 1
var/amount = 1
/obj/effect/decal/cleanable/liquid_fuel/New(turf/newLoc,amt=1,nologs=0)
/obj/effect/decal/cleanable/liquid_fuel/New(turf/newLoc,amt=1,nologs=1)
if(!nologs)
message_admins("Liquid fuel has spilled in [newLoc.loc.name] ([newLoc.x],[newLoc.y],[newLoc.z]) (<A HREF='?_src_=holder;adminplayerobservecoodjump=1;X=[newLoc.x];Y=[newLoc.y];Z=[newLoc.z]'>JMP</a>)")
log_game("Liquid fuel has spilled in [newLoc.loc.name] ([newLoc.x],[newLoc.y],[newLoc.z])")
+1 -1
View File
@@ -158,7 +158,7 @@ var/global/list/tele_landmarks = list() // Terrible, but the alternative is loop
var/safety = 100 // Infinite loop protection.
while(!T && safety)
var/turf/simulated/candidate = pick(planet.planet_floors)
if(!istype(candidate) || istype(candidate, /turf/simulated/sky))
if(!istype(candidate) || istype(candidate, /turf/simulated/sky) || !T.outdoors)
safety--
continue
else
+1 -1
View File
@@ -195,7 +195,7 @@ var/list/GPS_list = list()
tracking = TRUE // On by default.
/obj/item/device/gps/internal // Base type for immobile/internal GPS units.
icon_state = null
icon_state = "internal"
gps_tag = "Eerie Signal"
desc = "Report to a coder immediately."
invisibility = INVISIBILITY_MAXIMUM
+3 -1
View File
@@ -306,6 +306,7 @@
/obj/structure/flora/sif/subterranean/initialize()
icon_state = "[initial(icon_state)][rand(1,2)]"
..()
/obj/structure/flora/sif/eyes
name = "mysterious bulbs"
@@ -313,4 +314,5 @@
icon_state = "eyeplant"
/obj/structure/flora/sif/eyes/initialize()
icon_state = "[initial(icon_state)][rand(1,3)]"
icon_state = "[initial(icon_state)][rand(1,3)]"
..()