Skip to content

Commit

Permalink
Adds gorilla cubes to the uplink (tgstation#40468)
Browse files Browse the repository at this point in the history
* Adds gorilla cubes to the uplink

* fixes floyd's spelling
  • Loading branch information
81Denton authored and duncathan committed Sep 26, 2018
1 parent 92e399f commit b031ba7
Show file tree
Hide file tree
Showing 3 changed files with 36 additions and 2 deletions.
16 changes: 16 additions & 0 deletions code/game/objects/items/storage/boxes.dm
Original file line number Diff line number Diff line change
Expand Up @@ -404,6 +404,22 @@
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/gorillacubes
name = "gorilla cube box"
desc = "Waffle Co. brand gorilla cubes. Do not taunt."
icon_state = "monkeycubebox"
illustration = null

/obj/item/storage/box/gorillacubes/ComponentInitialize()
. = ..()
GET_COMPONENT(STR, /datum/component/storage)
STR.max_items = 3
STR.can_hold = typecacheof(list(/obj/item/reagent_containers/food/snacks/monkeycube))

/obj/item/storage/box/gorillacubes/PopulateContents()
for(var/i in 1 to 3)
new /obj/item/reagent_containers/food/snacks/monkeycube/gorilla(src)

/obj/item/storage/box/ids
name = "box of spare IDs"
desc = "Has so many empty IDs."
Expand Down
11 changes: 10 additions & 1 deletion code/modules/food_and_drinks/food/snacks_meat.dm
Original file line number Diff line number Diff line change
Expand Up @@ -190,10 +190,11 @@
tastes = list("the jungle" = 1, "bananas" = 1)
foodtype = MEAT | SUGAR
var/faction
var/spawned_mob = /mob/living/carbon/monkey

/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)
var/mob/living/bananas = new spawned_mob(drop_location(), TRUE, spammer)
if(faction)
bananas.faction = faction
if (!QDELETED(bananas))
Expand All @@ -206,6 +207,14 @@
/obj/item/reagent_containers/food/snacks/monkeycube/syndicate
faction = list("neutral", ROLE_SYNDICATE)

/obj/item/reagent_containers/food/snacks/monkeycube/gorilla
name = "gorilla cube"
desc = "A Waffle Co. brand gorilla cube. Now with extra molecules!"
bitesize = 20
list_reagents = list("nutriment" = 15)
tastes = list("the jungle" = 1, "bananas" = 1, "jimmies" = 1)
spawned_mob = /mob/living/simple_animal/hostile/gorilla

/obj/item/reagent_containers/food/snacks/enchiladas
name = "enchiladas"
desc = "Viva La Mexico!"
Expand Down
11 changes: 10 additions & 1 deletion code/modules/uplink/uplink_items.dm
Original file line number Diff line number Diff line change
Expand Up @@ -1470,6 +1470,14 @@ GLOBAL_LIST_INIT(uplink_items, subtypesof(/datum/uplink_item))
cost = 15
restricted_roles = list("Geneticist", "Chief Medical Officer")

/datum/uplink_item/role_restricted/gorillacubes
name = "Box of Gorilla Cubes"
desc = "A box with three Waffle Co. brand gorilla cubes. Eat big to get big. \
Caution: Product may rehydrate when exposed to water."
item = /obj/item/storage/box/gorillacubes
cost = 6
restricted_roles = list("Geneticist", "Chief Medical Officer")

/datum/uplink_item/role_restricted/pressure_mod
name = "Kinetic Accelerator Pressure Mod"
desc = "A modification kit which allows Kinetic Accelerators to do greatly increased damage while indoors. Occupies 35% mod capacity."
Expand Down Expand Up @@ -1505,7 +1513,8 @@ GLOBAL_LIST_INIT(uplink_items, subtypesof(/datum/uplink_item))
Simply insert your bikehorn and get in, and get ready to have the funniest ride of your life! \
You can ram any spacemen you come across and stuff them into your car, kidnapping them and locking them inside until \
someone saves them or they manage to crawl out. Be sure not to ram into any walls or vending machines, as the springloaded seats \
are very sensetive. Now with our included lube defense mechanism which will protect you against any angry shitcurity!"
are very sensitive. Now with our included lube defense mechanism which will protect you against any angry shitcurity! \
Premium features can be unlocked with a cryptographic sequencer!"
item = /obj/vehicle/sealed/car/clowncar
cost = 20
restricted_roles = list("Clown")
Expand Down

0 comments on commit b031ba7

Please sign in to comment.