cyberpresidentvanellope/Sandstorm-Station-13
1
0
Fork 0
mirror of https://github.com/Sandstorm-Station/Sandstorm-Station-13.git synced 2026-08-31 09:16: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/game/objects/items/borg_shapeshifter.dm
+1 -1
View File
@@ -589,7 +589,7 @@
f = user.filters[start+i]
animate(f, offset=f:offset, time=0, loop=3, flags=ANIMATION_PARALLEL)
animate(offset=f:offset-1, time=rand()*20+10)
if (do_after(user, 50, target=user) && user.cell.use(activationCost))
if (do_after(user, 5 SECONDS, user) && user.cell.use(activationCost))
playsound(src, 'sound/effects/bamf.ogg', 100, TRUE, -6)
to_chat(user, span_notice("You are now disguised as the Nanotrasen cyborg \"[friendlyName]\"."))
activate(user, module_selection)
modular_sand/code/game/objects/items/cosmetics.dm
+2 -2
View File
@@ -17,7 +17,7 @@
balloon_alert(user, "headgear in the way!")
return
user.visible_message(span_notice("[user] tries to change [H]'s hairstyle using [src]."), span_notice("You try to change [H]'s hairstyle using [src]."))
if(new_style && do_after(user, 60, target = H))
if(new_style && do_after(user, 6 SECONDS, H))
user.visible_message(span_notice("[user] successfully changes [H]'s hairstyle using [src]."), span_notice("You successfully change [H]'s hairstyle using [src]."))
H.balloon_alert(user, "changed hairstyle")
H.hair_style = new_style
@@ -39,7 +39,7 @@
balloon_alert(user, "mask in the way!")
return
user.visible_message(span_notice("[user] tries to change [H]'s facial hair style using [src]."), span_notice("You try to change [H]'s facial hair style using [src]."))
if(new_style && do_after(user, 60, target = H))
if(new_style && do_after(user, 6 SECONDS, H))
user.visible_message(span_notice("[user] successfully changes [H]'s facial hair style using [src]."), span_notice("You successfully change [H]'s facial hair style using [src]."))
H.balloon_alert(user, "changed facial hair style")
H.facial_hair_style = new_style
modular_sand/code/game/objects/items/devices/dogborg_sleeper.dm
+2 -2
View File
@@ -36,7 +36,7 @@
to_chat(user,span_warning("[I] is too large to fit into your [src]"))
return
user.visible_message(span_warning("[hound.name] is ingesting [I] into their [src.name]."), span_notice("You start ingesting [target] into your [src.name]..."))
if(do_after(user, 15, target = target) && length(contents) < max_item_count)
if(do_after(user, 1.5 SECONDS, target) && length(contents) < max_item_count)
I.forceMove(src)
I.visible_message(span_warning("[hound.name]'s garbage processor groans lightly as [I] slips inside."), span_notice("Your garbage compactor groans lightly as [I] slips inside."))
playsound(hound, 'sound/machines/disposalflush.ogg', 50, 1)
@@ -60,7 +60,7 @@
to_chat(user,span_warning("[trashman] is buckled and can not be put into your [src]."))
return
user.visible_message(span_warning("[hound.name] is ingesting [trashman] into their [src]."), span_notice("You start ingesting [trashman] into your [src.name]..."))
if(do_after(user, 30, target = trashman) && !patient && !trashman.buckled && length(contents) < max_item_count)
if(do_after(user, 3 SECONDS, trashman) && !patient && !trashman.buckled && length(contents) < max_item_count)
trashman.forceMove(src)
trashman.reset_perspective(src)
update_gut(user)