cyberpresidentvanellope/S.P.L.U.R.T-Station-13
1
0
Fork 0
mirror of https://github.com/SPLURT-Station/S.P.L.U.R.T-Station-13.git synced 2025-12-11 10:22:13 +00:00
Code Issues Packages Projects Releases Wiki Activity

fixes

Browse Source
This commit is contained in:
timothyteakettle
2021-01-05 23:18:52 +00:00
parent 535dede85b
commit a375448a54
4 changed files with 14 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
code/datums/helper_datums/teleport.dm
View File

@@ -85,6 +85,15 @@
var/mob/M = teleatom var/mob/M = teleatom
M.cancel_camera() M.cancel_camera()
var/static/list/bread_cache = typecacheof(/obj/item/reagent_containers/food/snacks/store/bread)
var/list/breadlist = typecache_filter_list(teleatom.GetAllContents(), bread_cache)
if(breadlist.len && (channel == TELEPORT_CHANNEL_BLUESPACE || channel == TELEPORT_CHANNEL_QUANTUM))
for(var/obj/item/reagent_containers/food/snacks/store/bread/bread in breadlist)
bread.bread_teleport()
else if(istype(teleatom, /obj/item/reagent_containers/food/snacks/store/bread))
var/obj/item/reagent_containers/food/snacks/store/bread/bread = teleatom
bread.bread_teleport()
return TRUE return TRUE
/proc/tele_play_specials(atom/movable/teleatom, atom/location, datum/effect_system/effect, sound) /proc/tele_play_specials(atom/movable/teleatom, atom/location, datum/effect_system/effect, sound)

13
code/modules/food_and_drinks/food/snacks_bread.dm
View File

@@ -7,16 +7,11 @@
foodtype = GRAIN foodtype = GRAIN
dunkable = TRUE dunkable = TRUE
/obj/item/reagent_containers/food/snacks/store/bread/Initialize() /obj/item/reagent_containers/food/snacks/store/bread/proc/bread_teleport()
. = ..()
RegisterSignal(src, COMSIG_MOVABLE_TELEPORTED , .proc/bread_teleport)
/obj/item/reagent_containers/food/snacks/store/bread/proc/bread_teleport(channel)
// you did WHAT? // you did WHAT?
if(channel == TELEPORT_CHANNEL_BLUESPACE || channel == TELEPORT_CHANNEL_QUANTUM) new /mob/living/simple_animal/hostile/bread(get_turf(src))
new /mob/living/simple_animal/bread(get_turf(src)) visible_message("<span class='warning'>[src] begins to deform and grow grotesque tumors!</span>")
visible_message("<span class='warning'>The [src] begins to deform and grow grotesque tumors!</span>") qdel(src)
qdel(src)
/obj/item/reagent_containers/food/snacks/breadslice /obj/item/reagent_containers/food/snacks/breadslice
icon = 'icons/obj/food/burgerbread.dmi' icon = 'icons/obj/food/burgerbread.dmi'

BIN
icons/mob/animal.dmi
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 414 KiB

After

Width:  |  Height:  |  Size: 416 KiB

1
tgstation.dme
View File

@@ -2716,6 +2716,7 @@
#include "code\modules\mob\living\simple_animal\hostile\banana_spider.dm" #include "code\modules\mob\living\simple_animal\hostile\banana_spider.dm"
#include "code\modules\mob\living\simple_animal\hostile\bear.dm" #include "code\modules\mob\living\simple_animal\hostile\bear.dm"
#include "code\modules\mob\living\simple_animal\hostile\bees.dm" #include "code\modules\mob\living\simple_animal\hostile\bees.dm"
#include "code\modules\mob\living\simple_animal\hostile\bread.dm"
#include "code\modules\mob\living\simple_animal\hostile\carp.dm" #include "code\modules\mob\living\simple_animal\hostile\carp.dm"
#include "code\modules\mob\living\simple_animal\hostile\cat_butcher.dm" #include "code\modules\mob\living\simple_animal\hostile\cat_butcher.dm"
#include "code\modules\mob\living\simple_animal\hostile\dark_wizard.dm" #include "code\modules\mob\living\simple_animal\hostile\dark_wizard.dm"