cyberpresidentvanellope/Aurora.3
1
0
Fork 0
mirror of https://github.com/Aurorastation/Aurora.3.git synced 2026-08-29 16:10:02 +01:00
Code Issues Packages Projects Releases Wiki Activity

Glove small resprite, inhands and some cleanup (#8372)

Browse Source
This commit is contained in:
Wowzewow (Wezzy)
2020-03-07 16:00:47 +01:00
committed by GitHub
parent d3e4a2bb7f
commit 5387d4cf47
14 changed files with 217 additions and 61 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/game/objects/random/random.dm
+15 -4
View File
@@ -634,7 +634,7 @@
/obj/random/spacecash
name = "random credit chips"
desc = "This is a random credit ships."
desc = "This is a random credit chip."
icon = 'icons/obj/cash.dmi'
icon_state = "spacecash1"
problist = list(
@@ -673,7 +673,7 @@
/obj/random/colored_jumpsuit
name = "random colored jumpsuit"
desc = "This is a random colowerd jumpsuit."
desc = "This is a random colored jumpsuit."
icon = 'icons/obj/clothing/uniforms.dmi'
icon_state = "black"
spawnlist = list(
@@ -880,7 +880,8 @@
/obj/random/technology_scanner = 1,
/obj/random/tool = 1,
/obj/random/toolbox = 1,
/obj/random_produce = 0.25
/obj/random_produce = 0.25,
/obj/random/watches = 1
)
@@ -936,10 +937,20 @@
/obj/item/clothing/gloves/fyellow = 1.2,
/obj/item/clothing/gloves/latex = 0.5,
/obj/item/clothing/gloves/latex/nitrile = 0.4,
/obj/item/clothing/gloves/watch = 0.3,
/obj/item/clothing/gloves/yellow = 0.9
)
/obj/random/watches
name = "random watches"
desc = "Random watches, probably able to tell the time."
icon = 'icons/obj/clothing/gloves.dmi'
icon_state = "watch"
problist = list(
/obj/item/clothing/gloves/watch = 1,
/obj/item/clothing/gloves/watch/silver = 0.7,
/obj/item/clothing/gloves/watch/gold = 0.5,
/obj/item/clothing/gloves/watch/spy = 0.3,
)
/obj/random/hoodie
name = "random winter coat"
code/game/objects/structures/therapy.dm
+67 -4
View File
@@ -72,15 +72,75 @@
return
/obj/item/mesmetron
name = "mesmetron pocketwatch"
desc = "An elaborate pocketwatch, with captivating gold etching and an enchanting face. . ."
/obj/item/pocketwatch
name = "pocketwatch"
desc = "A watch that goes in your pocket."
description_fluff = "Because your wrists have better things to do."
icon = 'icons/obj/items.dmi'
icon_state = "pocketwatch"
drop_sound = 'sound/items/drop/accessory.ogg'
matter = list("glass" = 150, "gold" = 50)
w_class = 1
var/closed = FALSE
/obj/item/pocketwatch/AltClick(mob/user)
if(!closed)
icon_state = "[initial(icon_state)]_closed"
to_chat(user, "You clasp the [name] shut.")
playsound(src.loc, 'sound/weapons/blade_close.ogg', 50, 1)
else
icon_state = "[initial(icon_state)]"
to_chat(user, "You flip the [name] open.")
playsound(src.loc, 'sound/weapons/blade_open.ogg', 50, 1)
closed = !closed
/obj/item/pocketwatch/examine(mob/user)
..()
if (get_dist(src, user) <= 1)
checktime()
/obj/item/pocketwatch/verb/checktime(mob/user)
set category = "Object"
set name = "Check Time"
set src in usr
if(closed)
to_chat(usr, "You check your watch, realising it's closed.")
else
to_chat(usr, "You check your watch, glancing over at the watch face, reading the time to be '[worldtime2text()]'. Today's date is '[time2text(world.time, "Month DD")]. [game_year]'.")
/obj/item/pocketwatch/verb/pointatwatch()
set category = "Object"
set name = "Point at watch"
set src in usr
if(closed)
usr.visible_message (span("notice", "[usr] taps their foot on the floor, arrogantly pointing at the [src] in their hand with a look of derision in their eyes, not noticing it's closed."), span("notice", "You point down at the [src], an arrogant look about your eyes."))
else
usr.visible_message (span("notice", "[usr] taps their foot on the floor, arrogantly pointing at the [src] in their hand with a look of derision in their eyes."), span("notice", "You point down at the [src], an arrogant look about your eyes."))
/obj/item/mesmetron
name = "mesmetron pocketwatch"
desc = "An elaborate pocketwatch, with a captivating gold etching and an enchanting face. . ."
icon = 'icons/obj/items.dmi'
icon_state = "pocketwatch"
drop_sound = 'sound/items/drop/accessory.ogg'
matter = list("glass" = 150, "gold" = 50)
w_class = 1
var/datum/weakref/thrall = null
var/time_counter = 0
var/closed = FALSE
/obj/item/mesmetron/AltClick(mob/user)
if(!closed)
icon_state = "[initial(icon_state)]_closed"
to_chat(user, "You clasp the [name] shut.")
playsound(src.loc, 'sound/weapons/blade_close.ogg', 50, 1)
else
icon_state = "[initial(icon_state)]"
to_chat(user, "You flip the [name] open.")
playsound(src.loc, 'sound/weapons/blade_open.ogg', 50, 1)
closed = !closed
/obj/item/mesmetron/Destroy()
STOP_PROCESSING(SSfast_process, src)
@@ -113,7 +173,7 @@
STOP_PROCESSING(SSfast_process, src)
/obj/item/mesmetron/attack_self(mob/user as mob)
if(!thrall || !thrall.resolve())
if(!closed || !thrall || !thrall.resolve())
thrall = null
to_chat(user, "You decipher the watch's mesmerizing face, discerning the time to be: '[worldtime2text()]'. Today's date is '[time2text(world.time, "Month DD")]. [game_year]'.")
return
@@ -143,6 +203,9 @@
thrall = null
/obj/item/mesmetron/afterattack(mob/living/carbon/human/H, mob/user, proximity)
if(closed)
return
if(!proximity)
return