cyberpresidentvanellope/Paradise
1
0
Fork 0
mirror of https://github.com/ParadiseSS13/Paradise.git synced 2026-08-22 03:27:05 +01:00
Code Issues Packages Projects Releases Wiki Activity

Extra Plushies + Plushify Spell (#27384)

Browse Source 
* Plushie PR

TODO-
Fix borgs becoming mind
Add to smite list
Add diona plush effect

* Fixed Issues

Added alien plush
Added loadout
Yeah

* Apply suggestions from code review

Co-authored-by: Contrabang <91113370+Contrabang@users.noreply.github.com>
Co-authored-by: Luc <89928798+lewcc@users.noreply.github.com>
Signed-off-by: Drakeven <50409888+Drakeven@users.noreply.github.com>

* WIP

Will finish later

* Fixed the various issues

Should be working now! Changed the bread smite to a 'generic item' smite and then made it a specifcally breaded smite.

* Minor typo fixing

And stuff

* WIP Conversion

Converting all the attacks into more sleek attacks, will need to finish.

* Fixes galore

Yippie!

* Russian revolver wasn't working

now you can self-shoot again! Horay!

* You can no longer eat spraycans

IPC clowns everywhere devistated

* Apply suggestions from code review

Co-authored-by: Burzah <116982774+Burzah@users.noreply.github.com>
Signed-off-by: Drakeven <50409888+Drakeven@users.noreply.github.com>

* A tinsy bit of touching up

:)

---------

Signed-off-by: Drakeven <50409888+Drakeven@users.noreply.github.com>
Co-authored-by: Contrabang <91113370+Contrabang@users.noreply.github.com>
Co-authored-by: Luc <89928798+lewcc@users.noreply.github.com>
Co-authored-by: Burzah <116982774+Burzah@users.noreply.github.com>
This commit is contained in:
Drakeven
2024-12-23 16:09:24 +00:00
committed by GitHub
co-authored by Contrabang Luc Burzah
parent 33eaf8ae42
commit a5726efe0c
38 changed files with 668 additions and 264 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/modules/reagents/chemistry/reagents/toxins.dm
+13
View File
@@ -1075,6 +1075,16 @@
else if(istype(O, /obj/structure/spacevine))
var/obj/structure/spacevine/SV = O
SV.on_chem_effect(src)
else if(istype(O, /obj/item/toy/plushie/dionaplushie))
var/turf/T = get_turf(O)
var/obj/item/toy/plushie/dionaplushie/DP = O
if(DP.grenade)
DP.explosive_betrayal(DP.grenade)
return
new /obj/item/toy/plushie/nymphplushie(T)
new /obj/item/toy/plushie/nymphplushie(T)
DP.visible_message("<span class='warning'>The diona plushie splits apart!</span>")
qdel(DP)
/datum/reagent/glyphosate/reaction_mob(mob/living/M, method = REAGENT_TOUCH, volume)
if(isliving(M))
@@ -1118,6 +1128,9 @@
if(istype(O, /obj/effect/decal/cleanable/ants))
O.visible_message("<span class='warning'>The ants die.</span>")
qdel(O)
if(istype(O, /obj/item/toy/plushie/kidanplushie))
var/obj/item/toy/plushie/kidanplushie/stupidbug = O
stupidbug.make_cry()
/datum/reagent/pestkiller/reaction_mob(mob/living/M, method = REAGENT_TOUCH, volume)
if(isliving(M))