mirror of
https://github.com/Bubberstation/Bubberstation.git
synced 2026-08-23 13:10:02 +01:00
Merge pull request #40395 from ShizCalev/syndie-monkey-cubes
Adds Waffle Co. brand monkey cubes
This commit is contained in:
@@ -1260,8 +1260,8 @@
|
||||
"eQ" = (
|
||||
/obj/machinery/light/small,
|
||||
/obj/structure/table/reinforced,
|
||||
/obj/item/storage/box/monkeycubes,
|
||||
/obj/item/storage/box/monkeycubes,
|
||||
/obj/item/storage/box/monkeycubes/syndicate,
|
||||
/obj/item/storage/box/monkeycubes/syndicate,
|
||||
/obj/effect/turf_decal/tile/neutral{
|
||||
dir = 1
|
||||
},
|
||||
|
||||
@@ -916,7 +916,7 @@
|
||||
/obj/structure/window/reinforced{
|
||||
dir = 1
|
||||
},
|
||||
/obj/item/storage/box/monkeycubes,
|
||||
/obj/item/storage/box/monkeycubes/syndicate,
|
||||
/turf/open/indestructible,
|
||||
/area/awaymission/centcomAway/general)
|
||||
"fB" = (
|
||||
|
||||
@@ -388,6 +388,7 @@
|
||||
desc = "Drymate brand monkey cubes. Just add water!"
|
||||
icon_state = "monkeycubebox"
|
||||
illustration = null
|
||||
var/cube_type = /obj/item/reagent_containers/food/snacks/monkeycube
|
||||
|
||||
/obj/item/storage/box/monkeycubes/ComponentInitialize()
|
||||
. = ..()
|
||||
@@ -397,7 +398,11 @@
|
||||
|
||||
/obj/item/storage/box/monkeycubes/PopulateContents()
|
||||
for(var/i in 1 to 5)
|
||||
new /obj/item/reagent_containers/food/snacks/monkeycube(src)
|
||||
new cube_type(src)
|
||||
|
||||
/obj/item/storage/box/monkeycubes/syndicate
|
||||
desc = "Waffle Co. brand monkey cubes. Just add water and a dash of subterfuge!"
|
||||
cube_type = /obj/item/reagent_containers/food/snacks/monkeycube/syndicate
|
||||
|
||||
/obj/item/storage/box/ids
|
||||
name = "box of spare IDs"
|
||||
|
||||
@@ -183,10 +183,13 @@
|
||||
filling_color = "#CD853F"
|
||||
tastes = list("the jungle" = 1, "bananas" = 1)
|
||||
foodtype = MEAT | SUGAR
|
||||
var/faction
|
||||
|
||||
/obj/item/reagent_containers/food/snacks/monkeycube/proc/Expand()
|
||||
var/mob/spammer = get_mob_by_key(fingerprintslast)
|
||||
var/mob/living/carbon/monkey/bananas = new(drop_location(), TRUE, spammer)
|
||||
if(faction)
|
||||
bananas.faction = faction
|
||||
if (!QDELETED(bananas))
|
||||
visible_message("<span class='notice'>[src] expands!</span>")
|
||||
bananas.log_message("Spawned via [src] at [AREACOORD(src)], Last attached mob: [key_name(spammer)].", LOG_ATTACK)
|
||||
@@ -194,6 +197,9 @@
|
||||
visible_message("<span class='notice'>[src] fails to expand!</span>")
|
||||
qdel(src)
|
||||
|
||||
/obj/item/reagent_containers/food/snacks/monkeycube/syndicate
|
||||
faction = list("neutral", ROLE_SYNDICATE)
|
||||
|
||||
/obj/item/reagent_containers/food/snacks/enchiladas
|
||||
name = "enchiladas"
|
||||
desc = "Viva La Mexico!"
|
||||
|
||||
Reference in New Issue
Block a user