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
36,205 changes: 18,107 additions & 18,098 deletions _maps/map_files/BoxStation/BoxStation.dmm

Large diffs are not rendered by default.

9,657 changes: 4,827 additions & 4,830 deletions _maps/map_files/CorgStation/CorgStation.dmm

Large diffs are not rendered by default.

43,482 changes: 21,744 additions & 21,738 deletions _maps/map_files/Deltastation/DeltaStation2.dmm

Large diffs are not rendered by default.

37,676 changes: 18,849 additions & 18,827 deletions _maps/map_files/EchoStation/EchoStation.dmm

Large diffs are not rendered by default.

31,315 changes: 15,659 additions & 15,656 deletions _maps/map_files/KiloStation/KiloStation.dmm

Large diffs are not rendered by default.

14,294 changes: 7,150 additions & 7,144 deletions _maps/map_files/MetaStation/MetaStation.dmm

Large diffs are not rendered by default.

20,355 changes: 10,178 additions & 10,177 deletions _maps/map_files/RadStation/RadStation.dmm

Large diffs are not rendered by default.

4,511 changes: 2,256 additions & 2,255 deletions _maps/map_files/generic/CentCom.dmm

Large diffs are not rendered by default.

99 changes: 50 additions & 49 deletions _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 @@ -1315,6 +1315,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
91 changes: 91 additions & 0 deletions code/game/objects/items/plushes.dm
Original file line number Diff line number Diff line change
Expand Up @@ -919,6 +919,97 @@
item_list[initial(I.name)] = choice
return item_list

/obj/item/toy/plush/sillycons
name = "Cyborg"
desc = "Always stays by the AIs side."
icon_state = "borgplush_default"
attack_verb = list("beeped aggressively", "dwoop", "beep", "beep, beep", "buzzes", "ping")

Check failure on line 926 in code/game/objects/items/plushes.dm

View workflow job for this annotation

GitHub Actions / Run Linters

undefined var 'attack_verb' on type '/obj/item/toy/plush/sillycons'
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 = 60
var/cooldown = FALSE

/obj/item/toy/plush/sillycons/peace/attack_self(mob/user)
. = ..()
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"

var/sound_alarm = 'sound/items/hypospray.ogg'
var/recharge_time = 60
var/cooldown = FALSE

/obj/item/toy/plush/sillycons/medi/attack_self(mob/user)
. = ..()
if(sound_alarm && !cooldown)
playsound(src, sound_alarm, 25, 1)
to_chat(user, "<span class='notice'>D'awww, the [src] injects you with morphine.</span>")

cooldown = TRUE
addtimer(VARSET_CALLBACK(src, cooldown, FALSE), recharge_time)
else
to_chat(user, "<span class='notice'>N'aww, the [src] is out of morphine.</span>")

/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
18 changes: 18 additions & 0 deletions code/modules/cargo/packs.dm
Original file line number Diff line number Diff line change
Expand Up @@ -3145,6 +3145,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