Skip to content

Commit

Permalink
Rebalances black and green core reactions also adds three items to gr…
Browse files Browse the repository at this point in the history
…een cores (fug) (vgstation-coders#14649)

* Rebalances black and green core reactions

* Rebalances black and green core reactions (reverted from commit 6776986)

* oh god what am i doing pls

* FINALLY finished slime tiles

* increases tiles you get to 5

* SLIME HEARTS NOW thanks intigracy for tht help

* removed capitalization

* shit

* fixed cd shit that wasn't needed apparently

* FUCK

* SPECIAL RAINCOAT FINISHED

* makes it possible to actually get the raincoat

* forgot to take off the original slime coat reaction

* did it the way c*ders wanted it
  • Loading branch information
cowsLUL authored and ihadtoregisterforthis committed Jul 3, 2017
1 parent 0c5276a commit 30fa9c0
Show file tree
Hide file tree
Showing 13 changed files with 133 additions and 86 deletions.
16 changes: 16 additions & 0 deletions code/game/objects/items/slime_heart.dm
@@ -0,0 +1,16 @@
/obj/item/slime_heart
name = "slime heart"
desc = "You devil..."
icon = 'icons/mob/slimes.dmi'
icon_state = "Slime-Heart"
item_state = "Slime-Heart"
w_class = W_CLASS_TINY

/obj/item/slime_heart/OnMobLife(var/mob)
if(iscarbon(mob))
var/mob/living/carbon/C = mob
if(C.is_holding_item(src))
if(C.dna && C.dna.mutantrace == "slime")
C.adjustToxLoss(-3)
else
C.adjustToxLoss(5)
21 changes: 20 additions & 1 deletion code/game/objects/items/stacks/tiles/tile_types.dm
Expand Up @@ -142,4 +142,23 @@
siemens_coefficient = 1
max_amount = 60

material = "fabric"
material = "fabric"

obj/item/stack/tile/slime
name = "tile of slime"
desc = "A flat piece of slime made through xenobiology"
icon_state = "tile-slime"
w_class = W_CLASS_MEDIUM
force = 1
throwforce = 1.0
throw_speed = 5
throw_range = 20
flags = FPRINT
siemens_coefficient = 1
max_amount = 30

/obj/item/stack/tile/slime/adjust_slowdown(mob/living/L, current_slowdown)
if(L.dna.mutantrace == "slime")
return -1
else
return current_slowdown+5
13 changes: 12 additions & 1 deletion code/game/turfs/simulated/floor.dm
Expand Up @@ -111,6 +111,8 @@ turf/simulated/floor/update_icon()
else if(is_plating())
if(!broken && !burnt)
icon_state = icon_plating //Because asteroids are 'platings' too.
else if(is_slime_floor())
icon_state = "tile-slime"
else if(is_light_floor())
var/obj/item/stack/tile/light/T = floor_tile
if(T.on)
Expand Down Expand Up @@ -171,7 +173,6 @@ turf/simulated/floor/update_icon()
else if(is_arcade_floor())
if(!broken && !burnt)
icon_state = "arcade"

else if(is_wood_floor())
if(!broken && !burnt)
if( !(icon_state in wood_icons) )
Expand Down Expand Up @@ -260,6 +261,12 @@ turf/simulated/floor/update_icon()
return 1
return 0

/turf/simulated/floor/is_slime_floor()
if(istype(floor_tile,/obj/item/stack/tile/slime))
return 1
else
return 0

/turf/simulated/floor/is_plating()
if(!floor_tile)
return 1
Expand Down Expand Up @@ -293,6 +300,10 @@ turf/simulated/floor/update_icon()
else if(is_grass_floor())
src.icon_state = "sand[pick("1","2","3")]"
broken = 1
else if(is_slime_floor())
spawn(rand(2,10))
make_plating()
return //slime burns up or completely loses form
else if(is_mineral_floor())
if(material=="diamond")
return //diamond doesn't break
Expand Down
2 changes: 2 additions & 0 deletions code/game/turfs/turf.dm
Expand Up @@ -240,6 +240,8 @@
return 0
/turf/proc/is_arcade_floor()
return 0
/turf/proc/is_slime_floor()
return 0
/turf/proc/is_mineral_floor()
return 0
/turf/proc/return_siding_icon_state() //used for grass floors, which have siding.
Expand Down
10 changes: 10 additions & 0 deletions code/modules/clothing/suits/slimecoat.dm
@@ -0,0 +1,10 @@
//i swear this isn't just a reference item

/obj/item/clothing/suit/wintercoat/slimecoat
name = "slime coat"
desc = "This does not look like it protects against water very well"
icon_state = "slimecoat"
item_state = "slimecoat"
body_parts_covered = UPPER_TORSO|LOWER_TORSO|ARMS|LEGS
armor = list(melee = 0, bullet = 0, laser = 0,energy = 0, bomb = 0, bio = 10, rad = 0)
allowed = list(/obj/item/weapon/gun/energy/temperature,/obj/item/device/flashlight/lamp/slime)
13 changes: 6 additions & 7 deletions code/modules/clothing/suits/wintercoat.dm
Expand Up @@ -35,7 +35,7 @@
coat = wc
else if(!coat)
qdel(src)

/obj/item/clothing/suit/wintercoat/captain
name = "captain's winter coat"
icon_state = "coatcaptain"
Expand All @@ -57,7 +57,7 @@
icon_state = "coatwarden"
body_parts_covered = UPPER_TORSO|LOWER_TORSO|ARMS|LEGS
nohood = 1

/obj/item/clothing/suit/wintercoat/medical
name = "medical winter coat"
icon_state = "coatmedical"
Expand Down Expand Up @@ -88,7 +88,7 @@
/obj/item/clothing/suit/wintercoat/prisoner
name = "prisoner winter coat"
icon_state = "coatprisoner"

/obj/item/clothing/suit/wintercoat/hop
name = "Head of Personnel's winter coat"
icon_state = "coathop"
Expand All @@ -99,7 +99,7 @@
name = "mining winter coat"
icon_state = "coatminer"
armor = list(melee = 10, bullet = 0, laser = 0, energy = 0, bomb = 0, bio = 0, rad = 0)

/obj/item/clothing/suit/wintercoat/clown
name = "Elfen winter coat"
icon_state = "coatclown"
Expand All @@ -111,7 +111,7 @@
/obj/item/clothing/suit/wintercoat/cmo
name = "Chief Medical Officer's winter coat"
icon_state = "coatcmo"

#define HAS_HOOD 1
#define NO_HOOD 0
/obj/item/clothing/suit/wintercoat/proc/togglehood()
Expand Down Expand Up @@ -140,7 +140,7 @@

/obj/item/clothing/suit/wintercoat/attack_self()
togglehood()

/obj/item/clothing/suit/wintercoat/proc/hoodup(var/mob/living/carbon/human/user)
user.equip_to_slot(hood, slot_head)
icon_state = "[initial(icon_state)]_t"
Expand All @@ -163,4 +163,3 @@
coat.hooddown(user,unequip = 0)
user.drop_from_inventory(src)
forceMove(coat)

142 changes: 65 additions & 77 deletions code/modules/reagents/Chemistry-Recipes.dm
Expand Up @@ -947,85 +947,43 @@
required_other = 1
required_container = /obj/item/slime_extract/green

/datum/chemical_reaction/slimeperidaxon
name = "Slime Peridaxon"
id = "m_peridaxon"
result = null
required_reagents = list(WATER = 5)
result_amount = 1
required_container = /obj/item/slime_extract/green
required_other = 1

/datum/chemical_reaction/slimeperidaxon/on_reaction(var/datum/reagents/holder)
feedback_add_details("slime_cores_used", "[replacetext(name, " ", "_")]")
var/obj/item/weapon/reagent_containers/glass/bottle/B = new /obj/item/weapon/reagent_containers/glass/bottle
B.name = "peridaxon bottle"
B.reagents.add_reagent(PERIDAXON, 5)
B.forceMove(get_turf(holder.my_atom))

/datum/chemical_reaction/slimedexplus
name = "Slime Dexalin Plus"
id = "m_dexplus"
/datum/chemical_reaction/slimetile
name = "Slime tiles"
id = "slimetile"
result = null
required_reagents = list(OXYGEN = 5)
result_amount = 1
required_reagents = list(IRON = 5)
required_container = /obj/item/slime_extract/green
required_other = 1

/datum/chemical_reaction/slimedexplus/on_reaction(var/datum/reagents/holder)
/datum/chemical_reaction/slimetile/on_reaction(var/datum/reagents/holder)
feedback_add_details("slime_cores_used", "[replacetext(name, " ", "_")]")
var/obj/item/weapon/reagent_containers/glass/bottle/B = new /obj/item/weapon/reagent_containers/glass/bottle
B.name = "Dexalin Plus Bottle"
B.reagents.add_reagent(DEXALINP, 5)
B.forceMove(get_turf(holder.my_atom))
var/obj/item/stack/tile/slime/T = new /obj/item/stack/tile/slime
T.amount = 5
T.forceMove(get_turf(holder.my_atom))

/datum/chemical_reaction/slimesdelight
name = "Slime Doctor's Delight"
id = "m_doctordelight"
/datum/chemical_reaction/slimeheart
name = "slime heart"
id = "R_heart"
result = null
required_reagents = list(SUGAR = 5)
result_amount = 1
required_reagents = list(BLOOD = 5)
required_container = /obj/item/slime_extract/green
required_other = 1

/datum/chemical_reaction/slimesdelight/on_reaction(var/datum/reagents/holder)
/datum/chemical_reaction/slimeheart/on_reaction(var/datum/reagents/holder)
feedback_add_details("slime_cores_used", "[replacetext(name, " ", "_")]")
var/obj/item/weapon/reagent_containers/glass/bottle/B = new /obj/item/weapon/reagent_containers/glass/bottle
B.name = "Doctor's Delight bottle"
B.reagents.add_reagent(DOCTORSDELIGHT, 10)
B.forceMove(get_turf(holder.my_atom))
var/obj/item/slime_heart/S = new /obj/item/slime_heart
S.forceMove(get_turf(holder.my_atom))

/datum/chemical_reaction/slimebicard
name = "Slime Bicaridine"
id = "m_bicaridine"
/datum/chemical_reaction/slimecoat
name = "slime coat"
id = "R_coat"
result = null
required_reagents = list(CARBON = 5)
result_amount = 1
required_reagents = list(WATER = 5)
required_container = /obj/item/slime_extract/green
required_other = 1

/datum/chemical_reaction/slimebicard/on_reaction(var/datum/reagents/holder)
/datum/chemical_reaction/slimecoat/on_reaction(var/datum/reagents/holder)
feedback_add_details("slime_cores_used", "[replacetext(name, " ", "_")]")
var/obj/item/weapon/reagent_containers/glass/bottle/B = new /obj/item/weapon/reagent_containers/glass/bottle
B.name = "bicaridine bottle"
B.reagents.add_reagent(BICARIDINE, 10)
B.forceMove(get_turf(holder.my_atom))

/datum/chemical_reaction/slimedermaline
name = "Slime Dermaline"
id = "m_dermaline"
result = null
required_reagents = list(PHOSPHORUS = 5)
result_amount = 1
required_container = /obj/item/slime_extract/green
required_other = 1

/datum/chemical_reaction/slimedermaline/on_reaction(var/datum/reagents/holder)
feedback_add_details("slime_cores_used", "[replacetext(name, " ", "_")]")
var/obj/item/weapon/reagent_containers/glass/bottle/B = new /obj/item/weapon/reagent_containers/glass/bottle
B.name = "Dermaline bottle"
B.reagents.add_reagent(DERMALINE, 5)
B.forceMove(get_turf(holder.my_atom))
var/obj/item/clothing/suit/wintercoat/slimecoat/C = new /obj/item/clothing/suit/wintercoat/slimecoat
C.forceMove(get_turf(holder.my_atom))

//Metal
/datum/chemical_reaction/slimemetal
Expand Down Expand Up @@ -1643,32 +1601,62 @@
/datum/chemical_reaction/slimemutate2/on_reaction(var/datum/reagents/holder)
feedback_add_details("slime_cores_used", "[replacetext(name, " ", "_")]")

/datum/chemical_reaction/slimemednanobots
name = "Slime Medical Nanobots"
id = "m_mednanobots"
result = MEDNANOBOTS
/datum/chemical_reaction/slimenanobots
name = "Slime Nanobots"
id = "s_nanobots"
result = NANOBOTS
required_reagents = list(GOLD = 5)
result_amount = 1
result_amount = 5
required_other = 1
required_container = /obj/item/slime_extract/black
alert_admins = ALERT_ALL_REAGENTS

/datum/chemical_reaction/slimemednanobots/on_reaction(var/datum/reagents/holder)
/datum/chemical_reaction/slimenanobots/on_reaction(var/datum/reagents/holder)
feedback_add_details("slime_cores_used", "[replacetext(name, " ", "_")]")

/datum/chemical_reaction/slimecomnanobots
name = "Slime Combat Nanobots"
id = "m_comnanobots"
result = COMNANOBOTS
required_reagents = list(URANIUM = 5)
/datum/chemical_reaction/slimeperidaxon
name = "Slime Peridaxon"
id = "m_peridaxon"
result = null
required_reagents = list(WATER = 5)
result_amount = 1
required_container = /obj/item/slime_extract/black
required_other = 1

/datum/chemical_reaction/slimeperidaxon/on_reaction(var/datum/reagents/holder)
feedback_add_details("slime_cores_used", "[replacetext(name, " ", "_")]")
var/obj/item/weapon/reagent_containers/glass/bottle/B = new /obj/item/weapon/reagent_containers/glass/bottle
B.name = "peridaxon bottle"
B.reagents.add_reagent(PERIDAXON, 5)
B.forceMove(get_turf(holder.my_atom))

/datum/chemical_reaction/slimesdelight
name = "Slime Doctor's Delight"
id = "m_doctordelight"
result = null
required_reagents = list(SUGAR = 5)
result_amount = 1
required_container = /obj/item/slime_extract/black
alert_admins = ALERT_ALL_REAGENTS
required_other = 1

/datum/chemical_reaction/slimecomnanobots/on_reaction(var/datum/reagents/holder)
/datum/chemical_reaction/slimesdelight/on_reaction(var/datum/reagents/holder)
feedback_add_details("slime_cores_used", "[replacetext(name, " ", "_")]")
var/obj/item/weapon/reagent_containers/glass/bottle/B = new /obj/item/weapon/reagent_containers/glass/bottle
B.name = "Doctor's Delight bottle"
B.reagents.add_reagent(DOCTORSDELIGHT, 10)
B.forceMove(get_turf(holder.my_atom))

/datum/chemical_reaction/slimerezadone
name = "Slime Rezadone"
id = "m_rezadone"
result = REZADONE
required_reagents = list(BLOOD = 5)
result_amount = 10
required_container = /obj/item/slime_extract/black
required_other = 1

/datum/chemical_reaction/slimerezadone/on_reaction(var/datum/reagents/holder)
feedback_add_details("slime_cores_used", "[replacetext(name, " ", "_")]")
//Oil
/datum/chemical_reaction/slimeexplosion
name = "Slime Explosion"
Expand Down
Binary file modified icons/mob/slimes.dmi
Binary file not shown.
Binary file modified icons/mob/suit.dmi
Binary file not shown.
Binary file modified icons/obj/clothing/suits.dmi
Binary file not shown.
Binary file modified icons/obj/items.dmi
Binary file not shown.
Binary file modified icons/turf/floors.dmi
Binary file not shown.
2 changes: 2 additions & 0 deletions vgstation13.dme
Expand Up @@ -644,6 +644,7 @@
#include "code\game\objects\items\mommiprints.dm"
#include "code\game\objects\items\ornaments.dm"
#include "code\game\objects\items\shooting_range.dm"
#include "code\game\objects\items\slime_heart.dm"
#include "code\game\objects\items\toys.dm"
#include "code\game\objects\items\trader.dm"
#include "code\game\objects\items\trash.dm"
Expand Down Expand Up @@ -1132,6 +1133,7 @@
#include "code\modules\clothing\suits\jobs.dm"
#include "code\modules\clothing\suits\labcoat.dm"
#include "code\modules\clothing\suits\miscellaneous.dm"
#include "code\modules\clothing\suits\slimecoat.dm"
#include "code\modules\clothing\suits\utility.dm"
#include "code\modules\clothing\suits\wintercoat.dm"
#include "code\modules\clothing\suits\wiz_robe.dm"
Expand Down

0 comments on commit 30fa9c0

Please sign in to comment.