Traitor Item Additions and Surplus Crates

This commit is contained in:
Fox-McCloud
2015-04-21 03:05:12 -04:00
parent 3a5195ae91
commit 9885688934
12 changed files with 280 additions and 25 deletions
+43
View File
@@ -0,0 +1,43 @@
/*
* Dehydrated Carp
* Instant carp, just add water
*/
// Child of carpplushie because this should do everything the toy does and more
/obj/item/toy/carpplushie/dehy_carp
var/mob/owner = null // Carp doesn't attack owner, set when using in hand
var/owned = 1 // Boolean, no owner to begin with
// Attack self
/obj/item/toy/carpplushie/dehy_carp/attack_self(mob/user as mob)
src.add_fingerprint(user) // Anyone can add their fingerprints to it with this
if(owned)
user << "<span class='notice'>[src] stares up at you with friendly eyes.</span>"
owner = user
owned = 0
return ..()
/obj/item/toy/carpplushie/dehy_carp/afterattack(obj/O, mob/user,proximity)
if(!proximity) return
if(istype(O,/obj/structure/sink))
user << "<span class='notice'>You place [src] under a stream of water...</span>"
user.drop_item()
loc = get_turf(O)
return Swell()
..()
/obj/item/toy/carpplushie/dehy_carp/proc/Swell()
desc = "It's growing!"
visible_message("<span class='notice'>[src] swells up!</span>")
// Animation
icon = 'icons/mob/animal.dmi'
flick("carp_swell", src)
// Wait for animation to end
sleep(6)
// Make space carp
var/mob/living/simple_animal/hostile/carp/C = new /mob/living/simple_animal/hostile/carp(get_turf(src))
// Make carp non-hostile to user, yes this means
C.faction |= "\ref[owner]"
qdel(src)
+4 -3
View File
@@ -1189,14 +1189,15 @@ obj/item/toy/cards/deck/syndicate/black
desc = "An adorable stuffed toy that resembles a space carp."
icon = 'icons/obj/toy.dmi'
icon_state = "carpplushie"
attack_verb = list("bit", "ate", "fin slapped")
attack_verb = list("bitten", "eaten", "fin slapped")
var/bitesound = 'sound/weapons/bite.ogg'
w_class = 2.0
/obj/item/toy/carpplushie/attack(mob/living/carbon/M as mob, mob/living/carbon/user as mob)
// Attack mob
/obj/item/toy/carpplushie/attack(mob/M as mob, mob/user as mob)
playsound(loc, bitesound, 20, 1) // Play bite sound in local area
return ..()
// Attack self
/obj/item/toy/carpplushie/attack_self(mob/user as mob)
playsound(src.loc, bitesound, 20, 1)
return ..()
@@ -177,6 +177,15 @@
src.add_fingerprint(user)
return
//Syndie variant of Secure Briefcase. Contains space cash, slightly more robust.
/obj/item/weapon/storage/secure/briefcase/syndie
force = 15.0
/obj/item/weapon/storage/secure/briefcase/syndie/New()
for(var/i = 0, i < storage_slots - 2, i++)
new /obj/item/weapon/spacecash/c1000(src)
return ..()
// -----------------------------
// Secure Safe
// -----------------------------
@@ -138,6 +138,17 @@
new /obj/item/clothing/head/helmet/space/syndicate/black/red(src)
return
/obj/item/weapon/storage/box/syndie_kit/hardsuit
name = "Boxed Blood Red Suit and Helmet"
can_hold = list(/obj/item/clothing/suit/space/rig/syndi, /obj/item/clothing/head/helmet/space/rig/syndi)
max_w_class = 3
/obj/item/weapon/storage/box/syndie_kit/hardsuit/New()
..()
new /obj/item/clothing/suit/space/rig/syndi(src)
new /obj/item/clothing/head/helmet/space/rig/syndi(src)
return
/obj/item/weapon/storage/box/syndie_kit/conversion
name = "box (CK)"