cyberpresidentvanellope/Bubberstation
1
0
Fork 0
mirror of https://github.com/Bubberstation/Bubberstation.git synced 2026-08-22 12:41:09 +01:00
Code Issues Packages Projects Releases Wiki Activity

Enables ghost to go through ladders

Browse Source 
Adds Cold snow turf
Adds Infinite Candles
This commit is contained in:
AnturK
2015-11-28 18:14:52 +01:00
parent b14e9133d2
commit b662b470a9
4 changed files with 60 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/game/objects/items/candle.dm
+15 -4
View File
@@ -8,10 +8,14 @@
w_class = 1
var/wax = 200
var/lit = 0
var/infinite = 0
var/start_lit = 0
heat = 1000
proc
light(var/flavor_text = "<span class='danger'>[usr] lights the [name].</span>")
/obj/item/candle/New()
..()
if(start_lit)
light()
/obj/item/candle/update_icon()
var/i
@@ -51,14 +55,16 @@
light() //honk
return
/obj/item/candle/light(var/flavor_text = "<span class='danger'>[usr] lights the [name].</span>")
/obj/item/candle/proc/light(var/flavor_text = "<span class='danger'>[usr] lights the [name].</span>")
if(!src.lit)
src.lit = 1
//src.damtype = "fire"
for(var/mob/O in viewers(usr, null))
O.show_message(flavor_text, 1)
SetLuminosity(CANDLE_LUMINOSITY)
SSobj.processing |= src
if(!infinite)
SSobj.processing |= src
update_icon()
/obj/item/candle/process()
@@ -99,4 +105,9 @@
/obj/item/candle/is_hot()
return lit * heat
/obj/item/candle/infinite
infinite = 1
start_lit = 1
#undef CANDLE_LUMINOSITY
code/game/objects/structures/ladders.dm
+23 -12
View File
@@ -41,35 +41,43 @@
else //wtf make your ladders properly assholes
icon_state = "ladder00"
/obj/structure/ladder/attack_hand(mob/user)
/obj/structure/ladder/proc/use(mob/user,is_ghost=0)
if(up && down)
switch( alert("Go up or down the ladder?", "Ladder", "Up", "Down", "Cancel") )
if("Up")
user.visible_message("[user] climbs up \the [src].", \
if(!is_ghost)
user.visible_message("[user] climbs up \the [src].", \
"<span class='notice'>You climb up \the [src].</span>")
up.add_fingerprint(user)
user.loc = get_turf(up)
up.add_fingerprint(user)
if("Down")
user.visible_message("[user] climbs down \the [src].", \
if(!is_ghost)
user.visible_message("[user] climbs down \the [src].", \
"<span class='notice'>You climb down \the [src].</span>")
down.add_fingerprint(user)
user.loc = get_turf(down)
down.add_fingerprint(user)
if("Cancel")
return
else if(up)
user.visible_message("[user] climbs up \the [src].", \
"<span class='notice'>You climb up \the [src].</span>")
if(!is_ghost)
user.visible_message("[user] climbs up \the [src].", \
"<span class='notice'>You climb up \the [src].</span>")
up.add_fingerprint(user)
user.loc = get_turf(up)
up.add_fingerprint(user)
else if(down)
user.visible_message("[user] climbs down \the [src].", \
"<span class='notice'>You climb down \the [src].</span>")
if(!is_ghost)
user.visible_message("[user] climbs down \the [src].", \
"<span class='notice'>You climb down \the [src].</span>")
down.add_fingerprint(user)
user.loc = get_turf(down)
down.add_fingerprint(user)
if(!is_ghost)
add_fingerprint(user)
add_fingerprint(user)
/obj/structure/ladder/attack_hand(mob/user)
use(user)
/obj/structure/ladder/attack_paw(mob/user)
return attack_hand(user)
@@ -77,6 +85,9 @@
/obj/structure/ladder/attackby(obj/item/weapon/W, mob/user, params)
return attack_hand(user)
/obj/structure/ladder/attack_ghost(mob/dead/observer/user)
use(user,1)
/obj/structure/ladder/unbreakable/Destroy()
return QDEL_HINT_LETMELIVE