cyberpresidentvanellope/Paradise
1
0
Fork 0
mirror of https://github.com/ParadiseSS13/Paradise.git synced 2026-07-19 02:54:41 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #3750 from FalseIncarnate/beach

Browse Source 
Beach Expansion Update
This commit is contained in:
Fox McCloud
2016-03-02 23:42:34 -05:00
parent 7bfb06ab86 a9f9fcad8d
commit b95c24ef34
9 changed files with 654 additions and 284 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/game/objects/structures/ladders.dm
+37 -5
View File
@@ -7,6 +7,7 @@
var/height = 0 //the 'height' of the ladder. higher numbers are considered physically higher
var/obj/structure/ladder/down = null //the ladder below this one
var/obj/structure/ladder/up = null //the ladder above this one
var/use_verb = "climbs"
/obj/structure/ladder/New()
spawn(8)
@@ -14,9 +15,13 @@
if(L.id == id)
if(L.height == (height - 1))
down = L
if(isnull(L.up))
L.up = src
continue
if(L.height == (height + 1))
up = L
if(isnull(L.down))
L.down = src
continue
if(up && down) //if both our connections are filled
@@ -42,12 +47,12 @@
if("Up")
user.visible_message("<span class='notice'>[user] climbs up \the [src]!</span>", \
"<span class='notice'>You climb up \the [src]!</span>")
user.loc = get_turf(up)
user.forceMove(get_turf(up))
up.add_fingerprint(user)
if("Down")
user.visible_message("<span class='notice'>[user] climbs down \the [src]!</span>", \
"<span class='notice'>You climb down \the [src]!</span>")
user.loc = get_turf(down)
user.forceMove(get_turf(down))
down.add_fingerprint(user)
if("Cancel")
return
@@ -55,16 +60,43 @@
else if(up)
user.visible_message("<span class='notice'>[user] climbs up \the [src]!</span>", \
"<span class='notice'>You climb up \the [src]!</span>")
user.loc = get_turf(up)
user.forceMove(get_turf(up))
up.add_fingerprint(user)
else if(down)
user.visible_message("<span class='notice'>[user] climbs down \the [src]!</span>", \
"<span class='notice'>You climb down \the [src]!</span>")
user.loc = get_turf(down)
user.forceMove(get_turf(down))
down.add_fingerprint(user)
add_fingerprint(user)
/obj/structure/ladder/attackby(obj/item/weapon/W, mob/user as mob, params)
return attack_hand(user)
return attack_hand(user)
/obj/structure/ladder/dive_point/buoy
name = "diving point bouy"
desc = "A buoy marking the location of an underwater dive area."
icon = 'icons/misc/beach.dmi'
icon_state = "buoy"
id = "dive"
height = 2
use_verb = "dives"
layer = MOB_LAYER + 0.2 //0.1 higher than the water overlay, this also means people can "swim" behind/under it
/obj/structure/ladder/dive_point/anchor
name = "diving point anchor"
desc = "An anchor tethered to the buoy at the surface, to keep the dive area marked."
icon = 'icons/misc/beach.dmi'
icon_state = "anchor"
id = "dive"
height = 1
use_verb = "ascends"
light_range = 5
/obj/structure/ladder/dive_point/New()
..()
set_light(light_range, light_power) //magical glowing anchor
/obj/structure/ladder/dive_point/update_icon()
return