mirror of
https://github.com/Bubberstation/Bubberstation.git
synced 2026-07-19 03:55:11 +01:00
Because I cannot bear it.
This commit is contained in:
@@ -3,14 +3,14 @@
|
||||
* Instant carp, just add water
|
||||
*/
|
||||
|
||||
// Child of carpplushie because this should do everything the toy does and more
|
||||
//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 = 0 // Boolean, no owner to begin with
|
||||
var/mob/owner = null //Carp doesn't attack owner, set when using in hand
|
||||
var/owned = 0 //Boolean, no owner to begin with
|
||||
|
||||
// Attack self
|
||||
/obj/item/toy/carpplushie/dehy_carp/attack_self(mob/user)
|
||||
src.add_fingerprint(user) // Anyone can add their fingerprints to it with this
|
||||
src.add_fingerprint(user) //Anyone can add their fingerprints to it with this
|
||||
if(!owned)
|
||||
user << "<span class='notice'>You pet [src]. You swear it looks up at you.</span>"
|
||||
owner = user
|
||||
@@ -30,12 +30,12 @@
|
||||
desc = "It's growing!"
|
||||
visible_message("<span class='notice'>[src] swells up!</span>")
|
||||
|
||||
// Animation
|
||||
//Animation
|
||||
icon = 'icons/mob/animal.dmi'
|
||||
flick("carp_swell", src)
|
||||
// Wait for animation to end
|
||||
sleep(6)
|
||||
// Make space carp
|
||||
//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, and their allies
|
||||
if(owner)
|
||||
@@ -45,7 +45,7 @@
|
||||
factions -= F
|
||||
C.faction = factions
|
||||
if (!owner || owner.faction != C.faction)
|
||||
visible_message("<span class='warning'>You have a bad feeling about this.</span>") // welcome to the hostile carp enjoy your die
|
||||
visible_message("<span class='warning'>You have a bad feeling about this.</span>") //welcome to the hostile carp enjoy your die
|
||||
else
|
||||
visible_message("<span class='notice'>The newly grown carp looks up at you with friendly eyes.</span>")
|
||||
qdel(src)
|
||||
@@ -1126,12 +1126,12 @@
|
||||
burn_state = 0 //Burnable
|
||||
var/bitesound = 'sound/weapons/bite.ogg'
|
||||
|
||||
// Attack mob
|
||||
//Attack mob
|
||||
/obj/item/toy/carpplushie/attack(mob/M, mob/user)
|
||||
playsound(loc, bitesound, 20, 1) // Play bite sound in local area
|
||||
playsound(loc, bitesound, 20, 1) //Play bite sound in local area
|
||||
return ..()
|
||||
|
||||
// Attack self
|
||||
//Attack self
|
||||
/obj/item/toy/carpplushie/attack_self(mob/user)
|
||||
playsound(src.loc, bitesound, 20, 1)
|
||||
user << "<span class='notice'>You pet [src]. D'awww.</span>"
|
||||
|
||||
Reference in New Issue
Block a user