Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Cyborg Plushies!! #11269

Closed
Closed
11 changes: 10 additions & 1 deletion _maps/map_files/BoxStation/BoxStation.dmm

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

9 changes: 3 additions & 6 deletions _maps/map_files/CorgStation/CorgStation.dmm

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

6 changes: 6 additions & 0 deletions _maps/map_files/Deltastation/DeltaStation2.dmm

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

4 changes: 2 additions & 2 deletions _maps/map_files/EchoStation/EchoStation.dmm

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

3 changes: 3 additions & 0 deletions _maps/map_files/KiloStation/KiloStation.dmm

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

6 changes: 6 additions & 0 deletions _maps/map_files/MetaStation/MetaStation.dmm

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

3 changes: 2 additions & 1 deletion _maps/map_files/RadStation/RadStation.dmm

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

1 change: 1 addition & 0 deletions _maps/map_files/generic/CentCom.dmm

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

3 changes: 2 additions & 1 deletion _maps/shuttles/infiltrator/infiltrator_basic.dmm

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

1 change: 1 addition & 0 deletions beestation.dme
Original file line number Diff line number Diff line change
Expand Up @@ -1267,6 +1267,7 @@
#include "code\game\objects\effects\spawners\gibspawner.dm"
#include "code\game\objects\effects\spawners\lootdrop.dm"
#include "code\game\objects\effects\spawners\mailspawner.dm"
#include "code\game\objects\effects\spawners\plushies.dm"
#include "code\game\objects\effects\spawners\roomspawner.dm"
#include "code\game\objects\effects\spawners\structure.dm"
#include "code\game\objects\effects\spawners\traps.dm"
Expand Down
11 changes: 11 additions & 0 deletions code/game/objects/effects/spawners/plushies.dm
Original file line number Diff line number Diff line change
@@ -0,0 +1,11 @@
/obj/effect/spawner/sillycons
name = "Indecisive Cyborg"
desc = "This one doesn't seem to have decided what to be yet, please be nice to them."
icon = 'icons/obj/plushes.dmi'
icon_state = "borgplush"

/obj/effect/spawner/sillycons/Initialize(mapload)
..()
var/random_sillycon = pick(subtypesof(/obj/item/toy/plush/sillycons/))
new random_sillycon(loc)
return INITIALIZE_HINT_QDEL
76 changes: 76 additions & 0 deletions code/game/objects/items/plushes.dm
Original file line number Diff line number Diff line change
Expand Up @@ -909,6 +909,82 @@
item_list[initial(I.name)] = choice
return item_list

/obj/item/toy/plush/sillycons/
MarkusLarsson421 marked this conversation as resolved.
Show resolved Hide resolved
name = "Cyborg"
desc = "Always stays by the AIs side."
icon_state = "borgplush_default"
attack_verb = list("beeped aggressively", "dwoop", "beep", "beep, beep", "buzzes", "ping")
squeak_override = list('sound/machines/buzz-sigh.ogg', 'sound/emotes/dwoop.ogg', 'sound/machines/boop.ogg', 'sound/machines/chime.ogg')
lefthand_file = 'icons/mob/inhands/plushes_lefthand.dmi'
righthand_file = 'icons/mob/inhands/plushes_righthand.dmi'
layer = 5

/obj/item/toy/plush/sillycons/peace
name = "Peacekeeper Borg"
desc = "Has universal record in repeatedly failing to uphold the peace since it entered production."
icon_state = "borgplush_peace"

var/sound_alarm = 'sound/ai/harmalarm.ogg'
var/recharge_time = 30
var/cooldown = FALSE

/obj/item/toy/plush/sillycons/peace/attack_self(mob/user)
. = ..()
to_chat(user, "<span class='notice'>You pet [src]. D'awww.</span>")
if(sound_alarm && !cooldown)
audible_message("<font color='red' size='5'>HUMAN HARM</font>")
playsound(src, sound_alarm, 25, 1)
cooldown = TRUE
addtimer(VARSET_CALLBACK(src, cooldown, FALSE), recharge_time)


/obj/item/toy/plush/sillycons/medi
name = "Mediborg"
desc = "Looks cute, might inject you with morphine later."
icon_state = "borgplush_medi"

/obj/item/toy/plush/sillycons/medi/syndie
name = "Syndicate Mediborg"
desc = "Emotionless killing machine."
icon_state = "borgplush_syndie_medi"

/obj/item/toy/plush/sillycons/engi
name = "Engiborg"
desc = "Praised as the best Station Engineer since it entered production."
icon_state = "borgplush_engi"

var/on = FALSE
var/sound_on = 'sound/items/flashlight_on.ogg'
var/sound_off = 'sound/items/flashlight_off.ogg'
light_range = 5
light_system = MOVABLE_LIGHT

/obj/item/toy/plush/sillycons/engi/syndie
name = "Syndicate Sabotour Cyborg"
desc = "What evil devious plans does the borgo have?"
icon_state = "borgplush_syndie_engi"

light_range = 7

/obj/item/toy/plush/sillycons/engi/attack_self(mob/user)
. = ..()
to_chat(user, "<span class='notice'>You toggle [src]'s light. D'awww.</span>")
on = !on
update_brightness()

/obj/item/toy/plush/sillycons/engi/proc/update_brightness()
if(on)
icon_state = "[initial(icon_state)]_on"
if(sound_on)
playsound(src, sound_on, 25, 1)
else
icon_state = initial(icon_state)
if(sound_off)
playsound(src, sound_off, 25, 1)
set_light_on(on)
if(light_system == STATIC_LIGHT)
update_light()

/////////////////
//DONATOR ITEMS//
/////////////////
Expand Down
20 changes: 19 additions & 1 deletion code/modules/cargo/packs.dm
Original file line number Diff line number Diff line change
Expand Up @@ -1803,7 +1803,7 @@
/obj/item/reagent_containers/medspray/sterilizine,
/obj/item/rollerbed)
crate_name = "surgical supplies crate"

/datum/supply_pack/medical/implants
name = "Surplus Implants Crate"
desc = "Do you want implants, but those R&D folks hasn't learnt how to do their job? Just get started with this crate containing several of our dusty surplus implants. (Surgical tools not included)"
Expand Down Expand Up @@ -3138,6 +3138,24 @@
plush_nomoth = pick(_temporary_list_plush_nomoth)
new plush_nomoth(C)

/datum/supply_pack/costumes_toys/sillycon
name = "Sillycon Crate"
desc = "A crate filled with six silly plushies and a master toy!"
cost = 2000
max_supply = 5
contains = list()
crate_type = /obj/structure/closet/crate/wooden
crate_name = "sillycon plushie crate"

/datum/supply_pack/costumes_toys/sillycon/fill(obj/structure/closet/crate/C)
new /obj/item/toy/talking/AI(C)
new /obj/item/toy/plush/sillycons/(C)
new /obj/item/toy/plush/sillycons/engi(C)
new /obj/item/toy/plush/sillycons/engi/syndie(C)
new /obj/item/toy/plush/sillycons/medi(C)
new /obj/item/toy/plush/sillycons/medi/syndie(C)
new /obj/item/toy/plush/sillycons/peace(C)

//////////////////////////////////////////////////////////////////////////////
///////////////////////// Wardrobe Resupplies ////////////////////////////////
//////////////////////////////////////////////////////////////////////////////
Expand Down
Binary file modified icons/mob/inhands/plushes_lefthand.dmi
Binary file not shown.
Binary file modified icons/mob/inhands/plushes_righthand.dmi
Binary file not shown.
Binary file modified icons/obj/plushes.dmi
Binary file not shown.
Loading