cyberpresidentvanellope/Sandstorm-Station-13
1
0
Fork 0
mirror of https://github.com/Sandstorm-Station/Sandstorm-Station-13.git synced 2026-08-26 14:48:26 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13

Browse Source
This commit is contained in:
SandPoot
2023-09-14 22:32:47 -03:00
parent 486e429597 98c0f38de3
commit 0b04af4b76
67 changed files with 219 additions and 412 deletions
Download Patch File Download Diff File Expand all files Collapse all files
modular_sand/code/modules/mining/lavaland/necropolis_chests.dm
+3 -3
View File
@@ -41,7 +41,7 @@
/obj/item/shield/riot/tower/swat/gladiator/AltClick(mob/user)
if(isliving(user))
if(do_after(user, 20, target = src))
if(do_after(user, 2 SECONDS, src))
new /obj/vehicle/ridden/lavaboat/dragon/gladiator(get_turf(user))
qdel(src)
@@ -61,7 +61,7 @@
/obj/vehicle/ridden/lavaboat/dragon/gladiator/AltClick(mob/user)
..()
if(isliving(user))
if(do_after(user, 20, target = src))
if(do_after(user, 2 SECONDS, src))
new /obj/item/shield/riot/tower/swat/gladiator(get_turf(user))
qdel(src)
@@ -989,7 +989,7 @@
//Apply a temp buff until the necklace is used
/obj/item/clothing/neck/necklace/necklace_of_the_forsaken/proc/temp_buff(mob/living/carbon/human/user)
to_chat(user, span_warning("You feel as if you have a second chance at something, but you're not sure what."))
if(do_after(user, 40, target = user))
if(do_after(user, 4 SECONDS, user))
to_chat(user, span_notice("The ember warms you..."))
ADD_TRAIT(user, TRAIT_NOHARDCRIT, "necklace_of_the_forsaken")//less chance of being gibbed
active_owner = user
modular_sand/code/modules/mob/living/simple_animal/bot/hugbot.dm
+2 -2
View File
@@ -155,13 +155,13 @@
speak(message)
playsound(src, messagevoice[message], 70, FALSE)
if(do_after(H, 3 SECONDS, target=src))
if(do_after(H, 3 SECONDS, src))
tip_over(H)
else if(H.a_intent == INTENT_HELP && mode == BOT_TIPPED)
H.visible_message(span_notice("[H] begins righting [src]."), span_notice("You begin righting [src]..."))
balloon_alert(H, "righting")
if(do_after(H, 3 SECONDS, target=src))
if(do_after(H, 3 SECONDS, src))
set_right(H)
else
..()