mirror of
https://github.com/Bubberstation/Bubberstation.git
synced 2026-08-26 06:29:23 +01:00
Adds a ventriloquist dummy. (#21511)
* Dummy inital * Adds dummies to meta and box. * Minor inhand touchup * Spelling and log
This commit is contained in:
@@ -62983,6 +62983,7 @@
|
||||
})
|
||||
"ceA" = (
|
||||
/obj/machinery/light/small,
|
||||
/obj/item/toy/dummy,
|
||||
/obj/item/toy/prize/honk{
|
||||
pixel_y = 12
|
||||
},
|
||||
|
||||
@@ -12944,6 +12944,7 @@
|
||||
pixel_y = 0
|
||||
},
|
||||
/obj/item/weapon/reagent_containers/food/snacks/baguette,
|
||||
/obj/item/toy/dummy,
|
||||
/turf/open/floor/plasteel/white/side{
|
||||
dir = 4
|
||||
},
|
||||
|
||||
@@ -344,7 +344,7 @@ var/global/image/fire_overlay = image("icon" = 'icons/effects/fire.dmi', "icon_s
|
||||
return 0
|
||||
|
||||
/obj/item/proc/talk_into(mob/M, input, channel, spans)
|
||||
return
|
||||
return ITALICS | REDUCE_RANGE
|
||||
|
||||
/obj/item/proc/dropped(mob/user)
|
||||
for(var/X in actions)
|
||||
|
||||
@@ -24,8 +24,8 @@
|
||||
|
||||
/obj/item/device/radio/headset/talk_into(mob/living/M, message, channel, list/spans)
|
||||
if (!listening)
|
||||
return
|
||||
..()
|
||||
return ITALICS | REDUCE_RANGE
|
||||
return ..()
|
||||
|
||||
/obj/item/device/radio/headset/receive_range(freq, level, AIuser)
|
||||
if(ishuman(src.loc))
|
||||
|
||||
@@ -198,6 +198,7 @@
|
||||
|
||||
/obj/item/device/radio/talk_into(atom/movable/M, message, channel, list/spans)
|
||||
addtimer(src,"talk_into_impl",0,FALSE,M,message,channel,spans)
|
||||
return ITALICS | REDUCE_RANGE
|
||||
|
||||
/obj/item/device/radio/proc/talk_into_impl(atom/movable/M, message, channel, list/spans)
|
||||
if(!on) return // the device has to be on
|
||||
|
||||
@@ -1371,3 +1371,29 @@
|
||||
name = "Warden action figure"
|
||||
icon_state = "warden"
|
||||
toysay = "Seventeen minutes for coughing at an officer!"
|
||||
|
||||
|
||||
/obj/item/toy/dummy
|
||||
name = "ventriloquist dummy"
|
||||
desc = "It's a dummy, dummy."
|
||||
icon = 'icons/obj/toy.dmi'
|
||||
icon_state = "assistant"
|
||||
item_state = "doll"
|
||||
var/doll_name = "Dummy"
|
||||
|
||||
//Add changing looks when i feel suicidal about making 20 inhands for these.
|
||||
/obj/item/toy/dummy/attack_self(mob/user)
|
||||
var/new_name = stripped_input(usr,"What would you like to name the dummy?","Input a name",doll_name,MAX_NAME_LEN)
|
||||
if(!new_name)
|
||||
return
|
||||
doll_name = new_name
|
||||
user << "You name the dummy as \"[doll_name]\""
|
||||
name = "[initial(name)] - [doll_name]"
|
||||
|
||||
/obj/item/toy/dummy/talk_into(atom/movable/M, message, channel, list/spans)
|
||||
log_say("[key_name(M)] : through dummy : [message]")
|
||||
say(message)
|
||||
return NOPASS
|
||||
|
||||
/obj/item/toy/dummy/GetVoice()
|
||||
return doll_name
|
||||
@@ -269,12 +269,12 @@ var/list/crit_allowed_modes = list(MODE_WHISPER,MODE_CHANGELING,MODE_ALIEN)
|
||||
if(MODE_R_HAND)
|
||||
for(var/obj/item/r_hand in get_held_items_for_side("r", all = TRUE))
|
||||
if (r_hand)
|
||||
r_hand.talk_into(src, message, , spans)
|
||||
return r_hand.talk_into(src, message, , spans)
|
||||
return ITALICS | REDUCE_RANGE
|
||||
if(MODE_L_HAND)
|
||||
for(var/obj/item/l_hand in get_held_items_for_side("l", all = TRUE))
|
||||
if (l_hand)
|
||||
l_hand.talk_into(src, message, , spans)
|
||||
return l_hand.talk_into(src, message, , spans)
|
||||
return ITALICS | REDUCE_RANGE
|
||||
|
||||
if(MODE_INTERCOM)
|
||||
|
||||
Binary file not shown.
|
Before Width: | Height: | Size: 121 KiB After Width: | Height: | Size: 122 KiB |
Binary file not shown.
|
Before Width: | Height: | Size: 119 KiB After Width: | Height: | Size: 120 KiB |
Reference in New Issue
Block a user