mirror of
https://github.com/Bubberstation/Bubberstation.git
synced 2026-08-28 23:58:07 +01:00
Merge branch 'master' of https://github.com/tgstation/-tg-station into DnaMonkeyStuff
Conflicts: code/__HELPERS/unsorted.dm code/modules/admin/verbs/one_click_antag.dm
This commit is contained in:
phil235
@@ -95,7 +95,8 @@
|
||||
new /obj/item/weapon/reagent_containers/spray/pepper(src)
|
||||
new /obj/item/weapon/melee/baton/loaded(src)
|
||||
new /obj/item/weapon/storage/belt/security/full(src)
|
||||
new /obj/item/weapon/gun/energy/gun/advtaser(src)
|
||||
new /obj/item/ammo_box/magazine/wt550m9(src)
|
||||
new /obj/item/weapon/gun/projectile/automatic/wt550(src)
|
||||
|
||||
/obj/structure/closet/secure_closet/security
|
||||
name = "security officer's locker"
|
||||
|
||||
@@ -1,14 +1,36 @@
|
||||
#define SKINTYPE_MONKEY /obj/item/stack/sheet/animalhide/monkey
|
||||
#define SKINTYPE_ALIEN /obj/item/stack/sheet/animalhide/xeno
|
||||
#define SKINTYPE_BEAR /obj/item/clothing/head/bearpelt
|
||||
#define SKINTYPE_CORGI /obj/item/stack/sheet/animalhide/corgi
|
||||
|
||||
#define SKINTYPE_MONKEY 1
|
||||
#define SKINTYPE_ALIEN 2
|
||||
#define SKINTYPE_BEAR 3
|
||||
|
||||
#define MEATTYPE_MONKEY 1
|
||||
#define MEATTYPE_ALIEN 2
|
||||
#define MEATTYPE_BEAR 3
|
||||
#define MEATTYPE_MONKEY /obj/item/weapon/reagent_containers/food/snacks/meat/slab/monkey
|
||||
#define MEATTYPE_ALIEN /obj/item/weapon/reagent_containers/food/snacks/meat/slab/xeno
|
||||
#define MEATTYPE_BEAR /obj/item/weapon/reagent_containers/food/snacks/meat/slab/bear
|
||||
#define MEATTYPE_CORGI /obj/item/weapon/reagent_containers/food/snacks/meat/slab/corgi
|
||||
|
||||
//////Kitchen Spike
|
||||
|
||||
/obj/structure/kitchenspike_frame
|
||||
name = "meatspike frame"
|
||||
icon = 'icons/obj/kitchen.dmi'
|
||||
icon_state = "spikeframe"
|
||||
desc = "The frame of a meat spike."
|
||||
density = 1
|
||||
anchored = 0
|
||||
|
||||
/obj/structure/kitchenspike_frame/attackby(obj/item/I, mob/user, params)
|
||||
add_fingerprint(user)
|
||||
if(default_unfasten_wrench(user, I))
|
||||
return
|
||||
else if(istype(I, /obj/item/stack/rods))
|
||||
var/obj/item/stack/rods/R = I
|
||||
if(R.get_amount() >= 4)
|
||||
R.use(4)
|
||||
user << "<span class='notice'>You add spikes to the frame.</span>"
|
||||
var/obj/F = new /obj/structure/kitchenspike(src.loc,)
|
||||
transfer_fingerprints_to(F)
|
||||
qdel(src)
|
||||
|
||||
/obj/structure/kitchenspike
|
||||
name = "meat spike"
|
||||
icon = 'icons/obj/kitchen.dmi'
|
||||
@@ -22,58 +44,83 @@
|
||||
var/skin = 0
|
||||
var/skintype = null
|
||||
|
||||
var/global/list/allowed_types = list( //ugh I know it's a whitelist but it's not as god-awful and hacky as before. at least this way it's sustainable. i don't think there's even a better way than this.
|
||||
/mob/living/carbon/monkey,
|
||||
/mob/living/carbon/alien,
|
||||
/mob/living/simple_animal/hostile/bear,
|
||||
/mob/living/simple_animal/pet/dog/corgi,
|
||||
)
|
||||
|
||||
var/global/list/meatlist = list(
|
||||
"monkey" = MEATTYPE_MONKEY,
|
||||
"alien" = MEATTYPE_ALIEN,
|
||||
"bear" = MEATTYPE_BEAR,
|
||||
"corgi" = MEATTYPE_CORGI,
|
||||
)
|
||||
var/global/list/skinlist = list(
|
||||
"monkey" = SKINTYPE_MONKEY,
|
||||
"alien" = SKINTYPE_ALIEN,
|
||||
"bear" = SKINTYPE_BEAR,
|
||||
"corgi" = SKINTYPE_CORGI,
|
||||
)
|
||||
|
||||
/obj/structure/kitchenspike/attack_paw(mob/user)
|
||||
return src.attack_hand(usr)
|
||||
|
||||
/obj/structure/kitchenspike/attackby(obj/item/weapon/grab/G, mob/user, params)
|
||||
if(!istype(G, /obj/item/weapon/grab))
|
||||
return
|
||||
if(istype(G.affecting, /mob/living/carbon/monkey))
|
||||
if(src.occupied == 0)
|
||||
src.icon_state = "spikebloody"
|
||||
src.occupied = 1
|
||||
src.meat = 5
|
||||
src.meattype = MEATTYPE_MONKEY
|
||||
src.skin = 1
|
||||
src.skintype = SKINTYPE_MONKEY
|
||||
for(var/mob/O in viewers(src, null))
|
||||
O.show_message(text("<span class='danger'>[user] has forced [G.affecting] onto the spike, killing them instantly!</span>"))
|
||||
qdel(G.affecting)
|
||||
qdel(G)
|
||||
/obj/structure/kitchenspike/proc/is_mob_allowed(var/obj/item/weapon/grab/G)
|
||||
for(var/I in allowed_types)
|
||||
if(istype(G.affecting, I))
|
||||
return I
|
||||
return 0
|
||||
|
||||
/obj/structure/kitchenspike/attackby(obj/item/I, mob/user, params)
|
||||
if(istype(I, /obj/item/weapon/crowbar))
|
||||
if(!src.occupied)
|
||||
playsound(loc, 'sound/items/Crowbar.ogg', 100, 1)
|
||||
if(do_after(user, 20, target = src))
|
||||
user << "<span class='notice'>You pry the spikes out of the frame.</span>"
|
||||
new /obj/item/stack/rods(loc, 4)
|
||||
var/obj/F = new /obj/structure/kitchenspike_frame(src.loc,)
|
||||
transfer_fingerprints_to(F)
|
||||
qdel(src)
|
||||
else
|
||||
user << "<span class='danger'>The spike already has something on it, finish collecting its meat first!</span>"
|
||||
else if(istype(G.affecting, /mob/living/carbon/alien))
|
||||
if(src.occupied == 0)
|
||||
src.icon_state = "spikebloodygreen"
|
||||
src.occupied = 1
|
||||
src.meat = 5
|
||||
src.meattype = MEATTYPE_ALIEN
|
||||
src.skin = 1
|
||||
src.skintype = SKINTYPE_ALIEN
|
||||
for(var/mob/O in viewers(src, null))
|
||||
O.show_message(text("<span class='danger'>[user] has forced [G.affecting] onto the spike, killing them instantly!</span>"))
|
||||
qdel(G.affecting)
|
||||
qdel(G)
|
||||
else
|
||||
user << "<span class='danger'>The spike already has something on it, finish collecting its meat first!</span>"
|
||||
else if(istype(G.affecting, /mob/living/simple_animal/hostile/bear))
|
||||
if(src.occupied == 0)
|
||||
src.icon_state = "spikebloodybearz"
|
||||
src.occupied = 1
|
||||
src.meat = 5
|
||||
src.meattype = MEATTYPE_BEAR
|
||||
src.skin = 1
|
||||
src.skintype = SKINTYPE_BEAR
|
||||
for(var/mob/O in viewers(src, null))
|
||||
O.show_message(text("<span class='danger'>[user] has forced [G.affecting] onto the spike, killing them instantly!</span>"))
|
||||
qdel(G.affecting)
|
||||
qdel(G)
|
||||
else
|
||||
user << "<span class='danger'>The spike already has something on it, finish collecting its meat first!</span>"
|
||||
else
|
||||
user << "<span class='danger'>They are too big for the spike, try something smaller!</span>"
|
||||
user << "<span class='notice'>You can't do that while something's on the spike!</span>"
|
||||
return
|
||||
if(istype(I, /obj/item/weapon/grab))
|
||||
var/obj/item/weapon/grab/G = I
|
||||
var/allowed_type = is_mob_allowed(G)
|
||||
if(allowed_type)
|
||||
if(!occupied)
|
||||
occupied = 1
|
||||
meat = 5
|
||||
skin = 1
|
||||
|
||||
var/list/affecting_path = text2list("[allowed_type]", "/") //we want a specific part of the type path for this: the last part of the path in allowed_types
|
||||
var/affecting_type = affecting_path[affecting_path.len] //ex. 1 if affecting.type is /mob/living/carbon/monkey, this will set affecting_type to "monkey"
|
||||
//ex. 2 if affecting.type is /mob/living/carbon/alien/humanoid/queen, this will set affecting_type to "alien"
|
||||
|
||||
//set these vars to the appropriate values based on type
|
||||
icon_state = "spikebloody[affecting_type]"
|
||||
meattype = meatlist["[affecting_type]"]
|
||||
skintype = skinlist["[affecting_type]"]
|
||||
|
||||
var/mob/living/O = G.affecting
|
||||
O.visible_message(text("<span class='danger'>[user] has forced [G.affecting] onto the spike, killing them instantly!</span>"))
|
||||
qdel(G.affecting)
|
||||
qdel(G)
|
||||
else
|
||||
user << "<span class='danger'>The spike already has something on it; finish collecting its meat first!</span>"
|
||||
return
|
||||
if(istype(G.affecting, /mob/living/carbon/human))
|
||||
user.changeNext_move(CLICK_CD_MELEE)
|
||||
playsound(src.loc, "sound/effects/splat.ogg", 25, 1)
|
||||
var/mob/living/carbon/human/H = G.affecting
|
||||
H.visible_message("<span class='danger'>[user] slams [G.affecting] into the meat spike!</span>", "<span class='userdanger'>[user] slams you into the meat spike!</span>", "<span class='italics'>You hear a squishy wet noise.</span>")
|
||||
H.adjustBruteLoss(20)
|
||||
return
|
||||
user << "<span class='danger'>You can't use that on the spike!</span>"
|
||||
return
|
||||
..()
|
||||
|
||||
///obj/structure/kitchenspike/MouseDrop_T(var/atom/movable/C, mob/user)
|
||||
// if(istype(C, /obj/mob/carbon/monkey)
|
||||
@@ -83,58 +130,27 @@
|
||||
/obj/structure/kitchenspike/attack_hand(mob/user)
|
||||
if(..())
|
||||
return
|
||||
if(src.occupied)
|
||||
if(src.meattype == MEATTYPE_MONKEY && src.skintype == SKINTYPE_MONKEY)
|
||||
if(src.skin >= 1)
|
||||
src.skin--
|
||||
new /obj/item/stack/sheet/animalhide/monkey(src.loc)
|
||||
user << "<span class='notice'>You remove the hide from the monkey.</span>"
|
||||
else if(src.meat > 1)
|
||||
src.meat--
|
||||
new /obj/item/weapon/reagent_containers/food/snacks/meat/slab/monkey(src.loc )
|
||||
usr << "<span class='notice'>You remove some meat from the monkey.</span>"
|
||||
else if(src.meat == 1)
|
||||
src.meat--
|
||||
new /obj/item/weapon/reagent_containers/food/snacks/meat/slab/monkey(src.loc)
|
||||
usr << "<span class='notice'>You remove the last piece of meat from the monkey.</span>"
|
||||
src.icon_state = "spike"
|
||||
src.occupied = 0
|
||||
else if(src.meattype == MEATTYPE_ALIEN && src.skintype == SKINTYPE_ALIEN)
|
||||
if(src.skin >= 1)
|
||||
src.skin--
|
||||
new /obj/item/stack/sheet/animalhide/xeno(src.loc)
|
||||
user << "<span class='notice'>You remove the hide from the alien.</span>"
|
||||
else if(src.meat > 1)
|
||||
src.meat--
|
||||
new /obj/item/weapon/reagent_containers/food/snacks/meat/slab/xeno(src.loc )
|
||||
usr << "<span class='notice'>You remove some meat from the alien.</span>"
|
||||
else if(src.meat == 1)
|
||||
src.meat--
|
||||
new /obj/item/weapon/reagent_containers/food/snacks/meat/slab/xeno(src.loc)
|
||||
usr << "<span class='notice'>You remove the last piece of meat from the alien.</span>"
|
||||
src.icon_state = "spike"
|
||||
src.occupied = 0
|
||||
else if(src.meattype == MEATTYPE_BEAR && src.skintype == SKINTYPE_BEAR)
|
||||
if(src.skin >= 1)
|
||||
src.skin--
|
||||
new /obj/item/clothing/head/bearpelt(src.loc)
|
||||
user << "<span class='notice'>You remove the hide from the bear.</span>"
|
||||
else if(src.meat > 1)
|
||||
src.meat--
|
||||
new /obj/item/weapon/reagent_containers/food/snacks/meat/slab/bear(src.loc )
|
||||
usr << "<span class='notice'>You remove some meat from the bear.</span>"
|
||||
else if(src.meat == 1)
|
||||
src.meat--
|
||||
new /obj/item/weapon/reagent_containers/food/snacks/meat/slab/bear(src.loc)
|
||||
usr << "<span class='notice'>You remove the last piece of meat from the bear.</span>"
|
||||
src.icon_state = "spike"
|
||||
src.occupied = 0
|
||||
if(occupied)
|
||||
if(meat >= 1)
|
||||
new meattype(src.loc)
|
||||
meat--
|
||||
if(meat > 1)
|
||||
usr << "<span class='notice'>You remove some meat from [src].</span>"
|
||||
return
|
||||
if(src.skin >=1)
|
||||
new skintype(src.loc)
|
||||
skin--
|
||||
usr << "<span class='notice'>You remove the hide from [src].</span>"
|
||||
icon_state = "spike"
|
||||
occupied = 0
|
||||
|
||||
|
||||
#undef SKINTYPE_MONKEY
|
||||
#undef SKINTYPE_ALIEN
|
||||
#undef SKINTYPE_BEAR
|
||||
#undef SKINTYPE_CORGI
|
||||
|
||||
#undef MEATTYPE_MONKEY
|
||||
#undef MEATTYPE_ALIEN
|
||||
#undef MEATTYPE_BEAR
|
||||
#undef MEATTYPE_BEAR
|
||||
#undef MEATTYPE_CORGI
|
||||
Reference in New Issue
Block a user