cyberpresidentvanellope/Bubberstation
1
0
Fork 0
mirror of https://github.com/Bubberstation/Bubberstation.git synced 2026-07-19 20:15:47 +01:00
Code Issues Packages Projects Releases Wiki Activity

New Slime Sprites (#83891)

Browse Source
This commit is contained in:
Andrew
2024-06-14 07:01:38 +03:00
committed by GitHub
parent e8edf8c30e
commit 832cecdbb1
7 changed files with 34 additions and 34 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/__DEFINES/research/slimes.dm
+3 -3
View File
@@ -44,12 +44,12 @@
#define SLIME_TYPE_BLUE "blue"
#define SLIME_TYPE_BLUESPACE "bluespace"
#define SLIME_TYPE_CERULEAN "cerulean"
#define SLIME_TYPE_DARK_BLUE "dark blue"
#define SLIME_TYPE_DARK_PURPLE "dark purple"
#define SLIME_TYPE_DARK_BLUE "dark-blue"
#define SLIME_TYPE_DARK_PURPLE "dark-purple"
#define SLIME_TYPE_GOLD "gold"
#define SLIME_TYPE_GREEN "green"
#define SLIME_TYPE_GREY "grey"
#define SLIME_TYPE_LIGHT_PINK "light pink"
#define SLIME_TYPE_LIGHT_PINK "light-pink"
#define SLIME_TYPE_METAL "metal"
#define SLIME_TYPE_OIL "oil"
#define SLIME_TYPE_ORANGE "orange"
code/modules/mob/living/basic/slime/slime.dm
+5 -5
View File
@@ -6,13 +6,13 @@
/mob/living/basic/slime
name = "grey baby slime (123)"
icon = 'icons/mob/simple/slimes.dmi'
icon_state = "grey baby slime"
icon_state = "grey-baby"
pass_flags = PASSTABLE | PASSGRILLE
gender = NEUTER
faction = list(FACTION_SLIME, FACTION_NEUTRAL)
icon_living = "grey baby slime"
icon_dead = "grey baby slime dead"
icon_living = "grey-baby"
icon_dead = "grey-baby-dead"
attack_sound = 'sound/weapons/bite.ogg'
@@ -187,8 +187,8 @@
/mob/living/basic/slime/regenerate_icons()
cut_overlays()
var/icon_text = "[slime_type.colour] [life_stage] slime"
icon_dead = "[icon_text] dead"
var/icon_text = "[slime_type.colour]-[life_stage]"
icon_dead = "[icon_text]-dead"
if(stat != DEAD)
icon_state = icon_text
if(current_mood && current_mood != SLIME_MOOD_NONE && !stat)
code/modules/mob_spawn/corpses/nonhuman_corpses.dm
+1 -1
View File
@@ -20,7 +20,7 @@
/obj/effect/mob_spawn/corpse/slime
mob_type = /mob/living/basic/slime
icon = 'icons/mob/simple/slimes.dmi'
icon_state = "grey baby slime" //sets the icon in the map editor
icon_state = "grey-baby-dead" //sets the icon in the map editor
///the color of the slime you're spawning.
var/slime_species = /datum/slime_type/grey
code/modules/power/cell.dm
+1 -1
View File
@@ -464,7 +464,7 @@
name = "EMP-proof slime core"
desc = "A yellow slime core infused with plasma. Its organic nature makes it immune to EMPs."
icon = 'icons/mob/simple/slimes.dmi'
icon_state = "yellow slime extract"
icon_state = "yellow-core"
custom_materials = null
maxcharge = STANDARD_CELL_CHARGE * 5
charge_light_type = null
code/modules/research/xenobiology/crossbreeding/_misc.dm
+1 -1
View File
@@ -84,7 +84,7 @@ Slimecrossing Items
name = "hypercharged slime core"
desc = "A charged yellow slime extract, infused with plasma. It almost hurts to touch."
icon = 'icons/mob/simple/slimes.dmi'
icon_state = "yellow slime extract"
icon_state = "yellow-core"
rating = 7
custom_materials = null
maxcharge = 50 * STANDARD_CELL_CHARGE
code/modules/research/xenobiology/xenobiology.dm
+23 -23
View File
@@ -4,7 +4,7 @@
name = "slime extract"
desc = "Goo extracted from a slime. Legends claim these to have \"magical powers\"."
icon = 'icons/mob/simple/slimes.dmi'
icon_state = "grey slime extract"
icon_state = "grey-core"
force = 0
w_class = WEIGHT_CLASS_TINY
throwforce = 0
@@ -93,7 +93,7 @@
/obj/item/slime_extract/grey
name = "grey slime extract"
icon_state = "grey slime extract"
icon_state = "grey-core"
crossbreed_modification = "reproductive"
activate_reagents = list(/datum/reagent/blood,/datum/reagent/toxin/plasma,/datum/reagent/water)
@@ -118,7 +118,7 @@
/obj/item/slime_extract/gold
name = "gold slime extract"
icon_state = "gold slime extract"
icon_state = "gold-core"
crossbreed_modification = "symbiont"
activate_reagents = list(/datum/reagent/blood,/datum/reagent/toxin/plasma,/datum/reagent/water)
@@ -149,7 +149,7 @@
/obj/item/slime_extract/silver
name = "silver slime extract"
icon_state = "silver slime extract"
icon_state = "silver-core"
crossbreed_modification = "consuming"
activate_reagents = list(/datum/reagent/toxin/plasma,/datum/reagent/water)
@@ -177,7 +177,7 @@
/obj/item/slime_extract/metal
name = "metal slime extract"
icon_state = "metal slime extract"
icon_state = "metal-core"
crossbreed_modification = "industrial"
activate_reagents = list(/datum/reagent/toxin/plasma,/datum/reagent/water)
@@ -201,7 +201,7 @@
/obj/item/slime_extract/purple
name = "purple slime extract"
icon_state = "purple slime extract"
icon_state = "purple-core"
crossbreed_modification = "regenerative"
activate_reagents = list(/datum/reagent/blood,/datum/reagent/toxin/plasma)
@@ -220,7 +220,7 @@
/obj/item/slime_extract/darkpurple
name = "dark purple slime extract"
icon_state = "dark purple slime extract"
icon_state = "dark-purple-core"
crossbreed_modification = "self-sustaining"
activate_reagents = list(/datum/reagent/toxin/plasma)
@@ -243,7 +243,7 @@
/obj/item/slime_extract/orange
name = "orange slime extract"
icon_state = "orange slime extract"
icon_state = "orange-core"
crossbreed_modification = "burning"
activate_reagents = list(/datum/reagent/blood,/datum/reagent/toxin/plasma,/datum/reagent/water)
@@ -263,7 +263,7 @@
/obj/item/slime_extract/yellow
name = "yellow slime extract"
icon_state = "yellow slime extract"
icon_state = "yellow-core"
crossbreed_modification = "charged"
activate_reagents = list(/datum/reagent/blood,/datum/reagent/toxin/plasma,/datum/reagent/water)
@@ -286,7 +286,7 @@
/obj/item/slime_extract/red
name = "red slime extract"
icon_state = "red slime extract"
icon_state = "red-core"
crossbreed_modification = "sanguine"
activate_reagents = list(/datum/reagent/blood,/datum/reagent/toxin/plasma,/datum/reagent/water)
@@ -306,7 +306,7 @@
/obj/item/slime_extract/blue
name = "blue slime extract"
icon_state = "blue slime extract"
icon_state = "blue-core"
crossbreed_modification = "stabilized"
activate_reagents = list(/datum/reagent/blood,/datum/reagent/toxin/plasma,/datum/reagent/water)
@@ -325,7 +325,7 @@
/obj/item/slime_extract/darkblue
name = "dark blue slime extract"
icon_state = "dark blue slime extract"
icon_state = "dark-blue-core"
crossbreed_modification = "chilling"
activate_reagents = list(/datum/reagent/toxin/plasma,/datum/reagent/water)
@@ -348,7 +348,7 @@
/obj/item/slime_extract/pink
name = "pink slime extract"
icon_state = "pink slime extract"
icon_state = "pink-core"
crossbreed_modification = "gentle"
activate_reagents = list(/datum/reagent/blood,/datum/reagent/toxin/plasma)
@@ -376,7 +376,7 @@
/obj/item/slime_extract/green
name = "green slime extract"
icon_state = "green slime extract"
icon_state = "green-core"
crossbreed_modification = "mutative"
activate_reagents = list(/datum/reagent/blood,/datum/reagent/toxin/plasma,/datum/reagent/uranium/radium)
@@ -400,7 +400,7 @@
/obj/item/slime_extract/lightpink
name = "light pink slime extract"
icon_state = "light pink slime extract"
icon_state = "light-pink-core"
crossbreed_modification = "loyal"
activate_reagents = list(/datum/reagent/toxin/plasma)
@@ -424,7 +424,7 @@
/obj/item/slime_extract/black
name = "black slime extract"
icon_state = "black slime extract"
icon_state = "black-core"
crossbreed_modification = "transformative"
activate_reagents = list(/datum/reagent/toxin/plasma)
@@ -445,7 +445,7 @@
/obj/item/slime_extract/oil
name = "oil slime extract"
icon_state = "oil slime extract"
icon_state = "oil-core"
crossbreed_modification = "detonating"
activate_reagents = list(/datum/reagent/blood,/datum/reagent/toxin/plasma)
@@ -469,7 +469,7 @@
/obj/item/slime_extract/adamantine
name = "adamantine slime extract"
icon_state = "adamantine slime extract"
icon_state = "adamantine-core"
crossbreed_modification = "crystalline"
activate_reagents = list(/datum/reagent/toxin/plasma)
@@ -499,7 +499,7 @@
/obj/item/slime_extract/bluespace
name = "bluespace slime extract"
icon_state = "bluespace slime extract"
icon_state = "bluespace-core"
crossbreed_modification = "warping"
activate_reagents = list(/datum/reagent/blood,/datum/reagent/toxin/plasma)
var/teleport_ready = FALSE
@@ -535,7 +535,7 @@
/obj/item/slime_extract/pyrite
name = "pyrite slime extract"
icon_state = "pyrite slime extract"
icon_state = "pyrite-core"
crossbreed_modification = "prismatic"
activate_reagents = list(/datum/reagent/blood,/datum/reagent/toxin/plasma)
@@ -562,7 +562,7 @@
/obj/item/slime_extract/cerulean
name = "cerulean slime extract"
icon_state = "cerulean slime extract"
icon_state = "cerulean-core"
crossbreed_modification = "recurring"
activate_reagents = list(/datum/reagent/blood,/datum/reagent/toxin/plasma)
@@ -582,7 +582,7 @@
/obj/item/slime_extract/sepia
name = "sepia slime extract"
icon_state = "sepia slime extract"
icon_state = "sepia-core"
crossbreed_modification = "lengthened"
activate_reagents = list(/datum/reagent/blood,/datum/reagent/toxin/plasma,/datum/reagent/water)
@@ -604,7 +604,7 @@
/obj/item/slime_extract/rainbow
name = "rainbow slime extract"
icon_state = "rainbow slime extract"
icon_state = "rainbow-core"
crossbreed_modification = "hyperchromatic"
activate_reagents = list(/datum/reagent/blood,/datum/reagent/toxin/plasma,"lesser plasma",/datum/reagent/toxin/slimejelly,"holy water and uranium") //Curse this snowflake reagent list.
icons/mob/simple/slimes.dmi
BIN
View File
Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 58 KiB

After

Width:  |  Height:  |  Size: 109 KiB