mirror of
https://github.com/CHOMPStation2/CHOMPStation2.git
synced 2026-01-04 14:33:58 +00:00
Merge branch 'master' into upstream-merge-11935
This commit is contained in:
@@ -1398,7 +1398,6 @@ End CHOMP Removal*/
|
||||
new /obj/item/weapon/material/knife/machete/hatchet/unathiknife/fluff/antoinette(hold)
|
||||
new /obj/item/weapon/reagent_containers/glass/bottle/poppy(hold)
|
||||
|
||||
|
||||
//Hunterbirk - Amaryll
|
||||
//This is a 'technical item' which basically is meant to represent rippiing things up with bare claws.
|
||||
/obj/item/weapon/surgical/scalpel/amaryll_claws
|
||||
@@ -1417,4 +1416,4 @@ End CHOMP Removal*/
|
||||
icon = 'icons/vore/custom_items_vr.dmi'
|
||||
icon_state = "stamp-midhorror"
|
||||
stamptext = "This paper has been certified by The Council of Mid Horror"
|
||||
|
||||
|
||||
|
||||
Reference in New Issue
Block a user