diff --git a/code/datums/supplypacks/hydroponics_vr.dm b/code/datums/supplypacks/hydroponics_vr.dm index 6d8db96375..08b721dba9 100644 --- a/code/datums/supplypacks/hydroponics_vr.dm +++ b/code/datums/supplypacks/hydroponics_vr.dm @@ -1,6 +1,6 @@ -/datum/supply_packs/hydro/goat +/datum/supply_packs/hydro/birds name = "Birds Crate" cost = 200 //You're getting 22 birds. Of course it's going to be a lot! containertype = /obj/structure/largecrate/birds containername = "Bird crate" - access = access_hydroponics + access = access_hydroponics \ No newline at end of file diff --git a/code/datums/supplypacks/recreation_vr.dm b/code/datums/supplypacks/recreation_vr.dm index 2467c2f47f..6db70ff778 100644 --- a/code/datums/supplypacks/recreation_vr.dm +++ b/code/datums/supplypacks/recreation_vr.dm @@ -5,4 +5,21 @@ ) containertype = /obj/structure/largecrate containername = "NT Humvee Crate" - cost = 100 \ No newline at end of file + cost = 100 + +/datum/supply_packs/recreation/restraints + name = "Recreational Restraints" + contains = list( + /obj/item/clothing/mask/muzzle, + /obj/item/clothing/glasses/sunglasses/blindfold, + /obj/item/weapon/handcuffs/fuzzy, + /obj/item/weapon/tape_roll, + /obj/item/stack/cable_coil/random, + /obj/item/clothing/accessory/collar/shock, + /obj/item/clothing/suit/straight_jacket, + /obj/item/weapon/legcuffs, + /obj/item/weapon/melee/fluff/holochain/mass + ) + containertype = /obj/structure/closet/crate + containername = "Restraints crate" + cost = 30 \ No newline at end of file diff --git a/code/datums/supplypacks/science_vr.dm b/code/datums/supplypacks/science_vr.dm index c7639ef3cc..7ffcf0db96 100644 --- a/code/datums/supplypacks/science_vr.dm +++ b/code/datums/supplypacks/science_vr.dm @@ -40,4 +40,19 @@ ) cost = 100 containertype = /obj/structure/largecrate - containername = "Exploration Dune Buggy Crate" \ No newline at end of file + containername = "Exploration Dune Buggy Crate" + +/datum/supply_packs/sci/pred + name = "Dangerous Predator crate" + cost = 40 + containertype = /obj/structure/largecrate/animal/pred + containername = "Dangerous Predator crate" + access = access_xenobiology + +/datum/supply_packs/sci/pred + name = "EXTREMELY Dangerous Predator crate" + cost = 200 + containertype = /obj/structure/largecrate/animal/dangerous + containername = "EXTREMELY Dangerous Predator crate" + access = access_xenobiology + contraband = 1 \ No newline at end of file diff --git a/code/game/objects/structures/crates_lockers/largecrate_vr.dm b/code/game/objects/structures/crates_lockers/largecrate_vr.dm index 3d2ce91f53..0e073eb865 100644 --- a/code/game/objects/structures/crates_lockers/largecrate_vr.dm +++ b/code/game/objects/structures/crates_lockers/largecrate_vr.dm @@ -35,4 +35,39 @@ "You hear splitting wood.") qdel(src) else - return attack_hand(user) \ No newline at end of file + return attack_hand(user) + +/obj/structure/largecrate/animal/pred + name = "Predator carrier" + held_type = /mob/living/simple_animal/catgirl + +/obj/structure/largecrate/animal/pred/New() //This is nessesary to get a random one each time. + + held_type = pick(/mob/living/simple_animal/hostile/bee, + /mob/living/simple_animal/catgirl;3, + /mob/living/simple_animal/hostile/frog, + /mob/living/simple_animal/horse, + /mob/living/simple_animal/hostile/panther, + /mob/living/simple_animal/hostile/snake, + /mob/living/simple_animal/hostile/wolf, + /mob/living/simple_animal/hostile/bear;0.5, + /mob/living/simple_animal/hostile/bear/brown;0.5, + /mob/living/simple_animal/hostile/carp, + /mob/living/simple_animal/hostile/mimic) + ..() + + +/obj/structure/largecrate/animal/dangerous + name = "Dangerous Predator carrier" + held_type = /mob/living/simple_animal/hostile/alien + +/obj/structure/largecrate/animal/dangerous/New() //This is nessesary to get a random one each time. + + held_type = pick(/mob/living/simple_animal/hostile/carp/pike, + /mob/living/simple_animal/hostile/deathclaw, + /mob/living/simple_animal/hostile/dino, + /mob/living/simple_animal/hostile/alien, + /mob/living/simple_animal/hostile/alien/drone, + /mob/living/simple_animal/hostile/alien/sentinel, + /mob/living/simple_animal/hostile/alien/queen) + ..() \ No newline at end of file diff --git a/code/modules/vore/fluffstuff/custom_items_vr.dm b/code/modules/vore/fluffstuff/custom_items_vr.dm index 96d8993f82..1baed38a2f 100644 --- a/code/modules/vore/fluffstuff/custom_items_vr.dm +++ b/code/modules/vore/fluffstuff/custom_items_vr.dm @@ -283,7 +283,6 @@ obj/item/weapon/material/hatchet/tacknife/combatknife/fluff/katarina/handle_shie item_state = "holochain_mob" flags = CONDUCT | NOBLOODY - no_attack_log = 1 //if you want to turn on the attack log for this, comment/delete this line. Orbis. slot_flags = SLOT_BELT force = 10 throwforce = 3 @@ -291,6 +290,13 @@ obj/item/weapon/material/hatchet/tacknife/combatknife/fluff/katarina/handle_shie damtype = HALLOSS attack_verb = list("flogged", "whipped", "lashed", "disciplined", "chastised", "flayed") +//General use +/obj/item/weapon/melee/fluff/holochain/mass + desc = "A mass produced version of the original. It has faux leather and an aluminium base, but still stings like the original." + force = 8 + attack_verb = list("flogged", "whipped", "lashed", "flayed") + + // joey4298:Emoticon /obj/item/device/fluff/id_kit_mime name = "Mime ID reprinter"