mirror of
https://github.com/ParadiseSS13/Paradise.git
synced 2026-07-11 23:23:28 +01:00
Assorted Sprite-Related Fixes
Candy canes no longer have transparent stripes - Fixes #2876 - Moved candy.dmi into the icons/obj/food/ folder - Removed the candy sprites from the food.dmi file Replaced reagentchocolatebar with cocoa_pile - This is what is made when you spill chocolate reagent on the floor, and is not the same as the chocolate bars you use for making stuff - Should avoid confusion and also fixes a potential infinite-generation exploit of chocolate and sugar - Fixes #2614 Flamethrower in-hand icons now display properly - Fixes #2856 - Will always show a tank in the in-hand, regardless of if a tank is attached Smartfridges will now remain visible when you open their panels with a screwdriver - Fixes #2847 Hand-rolled cigarettes now show on sprite when equipped as a mask - Fixes #2427 Apple seeds now have a proper seed packet - Fixes #1409 - Will make the xenobotany machines mentioned in the issue buildable in a separate PR, as that is beyond scope / feature-request
This commit is contained in:
@@ -133,17 +133,19 @@ datum/reagent/honey/reaction_turf(var/turf/T, var/volume)
|
||||
reagent_state = LIQUID
|
||||
color = "#2E2418"
|
||||
|
||||
datum/reagent/chocolate/on_mob_life(var/mob/living/M as mob)
|
||||
/datum/reagent/chocolate/on_mob_life(var/mob/living/M as mob)
|
||||
if(!M) M = holder.my_atom
|
||||
M.reagents.add_reagent("sugar", 0.8)
|
||||
..()
|
||||
return
|
||||
|
||||
datum/reagent/chocolate/reaction_turf(var/turf/T, var/volume)
|
||||
/datum/reagent/chocolate/reaction_turf(var/turf/T, var/volume)
|
||||
src = null
|
||||
if(volume >= 5)
|
||||
new /obj/item/weapon/reagent_containers/food/snacks/reagentchocolatebar(T)
|
||||
return
|
||||
var/volume_left = volume
|
||||
while(volume_left >= 5)
|
||||
new /obj/item/weapon/reagent_containers/food/snacks/cocoa_pile(T)
|
||||
volume_left -= 5
|
||||
return
|
||||
|
||||
/datum/reagent/mugwort
|
||||
name = "Mugwort"
|
||||
|
||||
@@ -405,16 +405,15 @@
|
||||
reagents.add_reagent("coco", 2)
|
||||
bitesize = 2
|
||||
|
||||
/obj/item/weapon/reagent_containers/food/snacks/reagentchocolatebar //for reagent chocolate
|
||||
name = "Chocolate Bar"
|
||||
desc = "A plain chocolate bar. Is it dark chocolate, milk chocolate? Who knows!"
|
||||
icon_state = "chocolatebar"
|
||||
/obj/item/weapon/reagent_containers/food/snacks/cocoa_pile //for reagent chocolate being spilled on turfs
|
||||
name = "Pile of Cocoa Powder"
|
||||
desc = "A pile of pure cocoa powder."
|
||||
icon_state = "cocoa"
|
||||
filling_color = "#7D5F46"
|
||||
|
||||
New()
|
||||
..()
|
||||
reagents.add_reagent("sugar", 10)
|
||||
reagents.add_reagent("chocolate",10)
|
||||
reagents.add_reagent("chocolate",5) //no longer can be used to generate the reagent infinitely
|
||||
bitesize = 2
|
||||
|
||||
/obj/item/weapon/reagent_containers/food/snacks/chocolateegg
|
||||
|
||||
@@ -10,6 +10,7 @@
|
||||
/obj/item/weapon/reagent_containers/food/snacks/candy/
|
||||
name = "generic candy"
|
||||
desc = "It's placeholder flavored. This shouldn't be seen."
|
||||
icon = 'icons/obj/food/candy.dmi'
|
||||
icon_state = "candy"
|
||||
New()
|
||||
..()
|
||||
|
||||
Reference in New Issue
Block a user