mirror of
https://github.com/CHOMPStation2/CHOMPStation2.git
synced 2025-12-11 10:43:20 +00:00
Added a way to teleport using obj/item/weapon/data/clown to the beach. Use on the teleporter computer for instant travel.
Minor map changes. git-svn-id: http://tgstation13.googlecode.com/svn/trunk@451 316c924e-a436-60f5-8080-3fe189b3f50e
This commit is contained in:
@@ -270,6 +270,14 @@
|
||||
var/special = null
|
||||
item_state = "card-id"
|
||||
|
||||
/obj/item/weapon/card/data/clown
|
||||
name = "Coordinates to Clown Planet"
|
||||
icon_state = "data"
|
||||
item_state = "card-id"
|
||||
layer = 3
|
||||
level = 2
|
||||
desc = "This card contains coordinates to the fabled Clown Planet. Handle with care."
|
||||
|
||||
/obj/item/weapon/card/emag
|
||||
desc = "It's a card with a magnetic strip attached to some circuitry."
|
||||
name = "cryptographic sequencer"
|
||||
|
||||
@@ -5,7 +5,24 @@
|
||||
|
||||
|
||||
/obj/machinery/computer/teleporter/attackby(obj/item/weapon/W)
|
||||
src.attack_hand()
|
||||
if (istype(W, /obj/item/weapon/card/data/))
|
||||
if(stat & (NOPOWER|BROKEN))
|
||||
src.attack_hand()
|
||||
|
||||
var/obj/S = null
|
||||
for(var/obj/landmark/sloc in world)
|
||||
if (sloc.name != "Clown Land")
|
||||
continue
|
||||
if (locate(/mob) in sloc.loc)
|
||||
continue
|
||||
S = sloc
|
||||
break
|
||||
if (!S)
|
||||
S = locate("landmark*["Clown Land"]") // use old stype
|
||||
if (istype(S, /obj/landmark/) && istype(S.loc, /turf))
|
||||
usr.loc = S.loc
|
||||
else
|
||||
src.attack_hand()
|
||||
|
||||
/obj/machinery/computer/teleporter/attack_paw()
|
||||
src.attack_hand()
|
||||
|
||||
10235
maps/tgstation.1.3.1.dmm
10235
maps/tgstation.1.3.1.dmm
File diff suppressed because it is too large
Load Diff
Reference in New Issue
Block a user