Replaces uplink Donk-pockets with Sin-Pockets.

Sin-Pockets can be self-heated using the future magic of producing heat by mixing chemicals.
Each heated pocket contains: Doctor's Delight - 5 units, Hyperzine - 5 units, Synaptizine - 1 unit.
Overconsumption is definitely possible by the careless.

Makes the concealed cane use non-del methods.
This commit is contained in:
PsiOmega
2015-02-11 09:55:50 +01:00
parent 3a6c4dacd6
commit 73bc5934d5
4 changed files with 73 additions and 16 deletions
+27 -7
View File
@@ -98,23 +98,43 @@
matter = list("metal" = 50)
attack_verb = list("bludgeoned", "whacked", "disciplined", "thrashed")
/obj/item/weapon/cane/concealed
var/atom/movable/concealed_blade
/obj/item/weapon/cane/concealed/New(var/blade)
..()
if(!isturf(blade))
concealed_blade = blade
else
concealed_blade = new/obj/item/weapon/kitchenknife/concealed(src)
loc = blade
/obj/item/weapon/cane/concealed/attack_self(mob/user)
user.visible_message("<span class='warning'>[user] has unsheathed a blade from \his [src]!</span>", "You unsheathe the blade from \the [src].")
var/blade = new/obj/item/weapon/kitchenknife/concealed
// Calling drop/put in hands to properly call item drop/pickup procs
user.drop_from_inventory(src)
user.put_in_hands(blade)
del(src)
user.put_in_hands(concealed_blade)
loc = concealed_blade
/obj/item/weapon/kitchenknife/concealed
name = "cane blade"
desc = "A now less than concealed cane blade."
var/atom/movable/container
/obj/item/weapon/kitchenknife/concealed/New(var/container)
..()
if(!isturf(container))
src.container = container
else
container = new/obj/item/weapon/cane/concealed(src)
loc = container
/obj/item/weapon/kitchenknife/concealed/attack_self(mob/user)
var/cane = new/obj/item/weapon/cane/concealed
user.visible_message("<span class='warning'>[user] has sheathed a blade into \his [container]!</span>", "You sheathe the blade into \the [container].")
// Calling drop/put in hands to properly call item drop/pickup procs
user.drop_from_inventory(src)
user.put_in_hands(cane)
del(src)
user.visible_message("<span class='warning'>[user] has sheathed a blade into \his [cane]!</span>", "You sheathe the blade into \the [cane].")
user.put_in_hands(container)
loc = container
/obj/item/weapon/disk
name = "disk"
@@ -323,6 +323,20 @@
new /obj/item/weapon/reagent_containers/food/snacks/donkpocket(src)
new /obj/item/weapon/reagent_containers/food/snacks/donkpocket(src)
new /obj/item/weapon/reagent_containers/food/snacks/donkpocket(src)
/obj/item/weapon/storage/box/sinpockets
name = "box of sin-pockets"
desc = "<B>Instructions:</B> <I>Crush bottom of package to initiate chemical heating. Wait for 20 seconds before consumption. Product will cool if not eaten within seven minutes.</I>"
icon_state = "donk_kit"
New()
..()
new /obj/item/weapon/reagent_containers/food/snacks/donkpocket/sinpocket(src)
new /obj/item/weapon/reagent_containers/food/snacks/donkpocket/sinpocket(src)
new /obj/item/weapon/reagent_containers/food/snacks/donkpocket/sinpocket(src)
new /obj/item/weapon/reagent_containers/food/snacks/donkpocket/sinpocket(src)
new /obj/item/weapon/reagent_containers/food/snacks/donkpocket/sinpocket(src)
new /obj/item/weapon/reagent_containers/food/snacks/donkpocket/sinpocket(src)
/obj/item/weapon/storage/box/monkeycubes
name = "monkey cube box"
+1 -5
View File
@@ -180,11 +180,7 @@ I said no!
)
result = /obj/item/weapon/reagent_containers/food/snacks/donkpocket //SPECIAL
proc/warm_up(var/obj/item/weapon/reagent_containers/food/snacks/donkpocket/being_cooked)
being_cooked.warm = 1
being_cooked.reagents.add_reagent("tricordrazine", 5)
being_cooked.bitesize = 6
being_cooked.name = "Warm " + being_cooked.name
being_cooked.cooltime()
being_cooked.heat()
make_food(var/obj/container as obj)
var/obj/item/weapon/reagent_containers/food/snacks/donkpocket/being_cooked = ..(container)
warm_up(being_cooked)
@@ -698,6 +698,23 @@
reagents.add_reagent("protein", 6)
bitesize = 2
/obj/item/weapon/reagent_containers/food/snacks/donkpocket/sinpocket
name = "\improper Sin-pocket"
desc = "The food of choice for the veteran. Do <B>NOT</B> overconsume."
filling_color = "#6D6D00"
heated_reagents = list("doctorsdelight" = 5, "hyperzine" = 5, "synaptizine" = 1)
var/has_been_heated = 0
/obj/item/weapon/reagent_containers/food/snacks/donkpocket/sinpocket/attack_self(mob/user)
if(has_been_heated)
user << "<span class='notice'>The heating chemicals have already been spent.</span>"
return
has_been_heated = 1
user.visible_message("<span class='notice'>[user] crushes \the [src] package.</span>", "You crush \the [src] package and feel a comfortable heat build up.")
spawn(200)
user << "You think \the [src] is ready to eat about now."
heat()
/obj/item/weapon/reagent_containers/food/snacks/donkpocket
name = "Donk-pocket"
desc = "The food of choice for the seasoned traitor."
@@ -710,12 +727,22 @@
reagents.add_reagent("protein", 2)
var/warm = 0
proc/cooltime() //Not working, derp?
var/list/heated_reagents = list("tricordrazine" = 5)
proc/heat()
warm = 1
for(var/reagent in heated_reagents)
reagents.add_reagent(reagent, heated_reagents[reagent])
bitesize = 6
name = "Warm " + name
cooltime()
proc/cooltime()
if (src.warm)
spawn( 4200 )
spawn(4200)
src.warm = 0
src.reagents.del_reagent("tricordrazine")
src.name = "donk-pocket"
for(var/reagent in heated_reagents)
src.reagents.del_reagent(reagent)
src.name = initial(name)
return
/obj/item/weapon/reagent_containers/food/snacks/brainburger