diff --git a/code/game/objects/structures/mineral_doors.dm b/code/game/objects/structures/mineral_doors.dm index 027f9f647da..92635f7f30c 100644 --- a/code/game/objects/structures/mineral_doors.dm +++ b/code/game/objects/structures/mineral_doors.dm @@ -115,6 +115,14 @@ attack_hand(user) return + + bullet_act(var/obj/item/projectile/Proj) + hardness -= Proj.damage + ..() + CheckHardness() + return + + proc/CheckHardness() if(hardness <= 0) Dismantle(1) @@ -296,7 +304,7 @@ /obj/structure/mineral_door/resin mineralType = "resin" - hardness = 1.5 + hardness = 1 var/close_delay = 100 TryToSwitchState(atom/user) diff --git a/code/modules/mob/living/carbon/metroid/metroid.dm b/code/modules/mob/living/carbon/metroid/metroid.dm index d53d782f938..b8004a795e4 100644 --- a/code/modules/mob/living/carbon/metroid/metroid.dm +++ b/code/modules/mob/living/carbon/metroid/metroid.dm @@ -731,6 +731,20 @@ mob/living/carbon/slime/var/temperature_resistance = T0C+75 throw_range = 6 origin_tech = "biotech=4" var/Uses = 1 // uses before it goes inert + var/enhanced = 0 //has it been enhanced before? + + attackby(obj/item/O as obj, mob/user as mob) + if(istype(O, /obj/item/weapon/slimesteroid2)) + if(enhanced == 1) + user << "\red This extract has already been enhanced!" + return ..() + if(Uses == 0) + user << "\red You can't enhance a used extract!" + return ..() + user <<"You apply the enhancer. It now has triple the amount of uses." + Uses = 3 + enhanced = 1 + del (O) /obj/item/slime_extract/New() ..() @@ -810,6 +824,17 @@ mob/living/carbon/slime/var/temperature_resistance = T0C+75 name = "bluespace slime extract" icon_state = "bluespace slime extract" +/obj/item/slime_extract/pyrite + name = "pyrite slime extract" + icon_state = "pyrite slime extract" + +/obj/item/slime_extract/cerulean + name = "cerulean slime extract" + icon_state = "cerulean slime extract" + +/obj/item/slime_extract/sepia + name = "sepia slime extract" + icon_state = "sepia slime extract" ////Pet Slime Creation/// @@ -898,6 +923,24 @@ mob/living/carbon/slime/var/temperature_resistance = T0C+75 M.cores = 3 del (src) +/obj/item/weapon/slimesteroid2 + name = "extract enhancer" + desc = "A potent chemical mix that will give a slime extract three uses." + icon = 'icons/obj/chemical.dmi' + icon_state = "bottle17" + + /*afterattack(obj/target, mob/user , flag) + if(istype(target, /obj/item/slime_extract)) + if(target.enhanced == 1) + user << "\red This extract has already been enhanced!" + return ..() + if(target.Uses == 0) + user << "\red You can't enhance a used extract!" + return ..() + user <<"You apply the enhancer. It now has triple the amount of uses." + target.Uses = 3 + target.enahnced = 1 + del (src)*/ ////////Adamantine Golem stuff I dunno where else to put it diff --git a/code/modules/mob/living/carbon/metroid/subtypes.dm b/code/modules/mob/living/carbon/metroid/subtypes.dm index 9f1acccdbb9..61548badf21 100644 --- a/code/modules/mob/living/carbon/metroid/subtypes.dm +++ b/code/modules/mob/living/carbon/metroid/subtypes.dm @@ -99,9 +99,9 @@ icon_state = "dark blue baby slime" primarytype = /mob/living/carbon/slime/darkblue mutationone = /mob/living/carbon/slime/purple - mutationtwo = /mob/living/carbon/slime/purple + mutationtwo = /mob/living/carbon/slime/cerulean mutationthree = /mob/living/carbon/slime/blue - mutationfour = /mob/living/carbon/slime/blue + mutationfour = /mob/living/carbon/slime/cerulean adulttype = /mob/living/carbon/slime/adult/darkblue coretype = /obj/item/slime_extract/darkblue @@ -110,9 +110,9 @@ colour = "dark blue" primarytype = /mob/living/carbon/slime/darkblue mutationone = /mob/living/carbon/slime/purple - mutationtwo = /mob/living/carbon/slime/purple + mutationtwo = /mob/living/carbon/slime/cerulean mutationthree = /mob/living/carbon/slime/blue - mutationfour = /mob/living/carbon/slime/blue + mutationfour = /mob/living/carbon/slime/cerulean adulttype = /mob/living/carbon/slime/adult/darkblue coretype = /obj/item/slime_extract/darkblue @@ -121,9 +121,9 @@ icon_state = "dark purple baby slime" primarytype = /mob/living/carbon/slime/darkpurple mutationone = /mob/living/carbon/slime/purple - mutationtwo = /mob/living/carbon/slime/purple + mutationtwo = /mob/living/carbon/slime/sepia mutationthree = /mob/living/carbon/slime/orange - mutationfour = /mob/living/carbon/slime/orange + mutationfour = /mob/living/carbon/slime/sepia adulttype = /mob/living/carbon/slime/adult/darkpurple coretype = /obj/item/slime_extract/darkpurple @@ -132,8 +132,8 @@ colour = "dark purple" primarytype = /mob/living/carbon/slime/darkpurple mutationone = /mob/living/carbon/slime/purple - mutationtwo = /mob/living/carbon/slime/purple - mutationthree = /mob/living/carbon/slime/orange + mutationtwo = /mob/living/carbon/slime/sepia + mutationthree = /mob/living/carbon/slime/sepia mutationfour = /mob/living/carbon/slime/orange adulttype = /mob/living/carbon/slime/adult/darkpurple coretype = /obj/item/slime_extract/darkpurple @@ -144,9 +144,9 @@ colour = "yellow" primarytype = /mob/living/carbon/slime/yellow mutationone = /mob/living/carbon/slime/metal - mutationtwo = /mob/living/carbon/slime/metal + mutationtwo = /mob/living/carbon/slime/bluespace mutationthree = /mob/living/carbon/slime/orange - mutationfour = /mob/living/carbon/slime/orange + mutationfour = /mob/living/carbon/slime/bluespace adulttype = /mob/living/carbon/slime/adult/yellow coretype = /obj/item/slime_extract/yellow @@ -155,9 +155,9 @@ colour = "yellow" primarytype = /mob/living/carbon/slime/yellow mutationone = /mob/living/carbon/slime/metal - mutationtwo = /mob/living/carbon/slime/metal + mutationtwo = /mob/living/carbon/slime/bluespace mutationthree = /mob/living/carbon/slime/orange - mutationfour = /mob/living/carbon/slime/orange + mutationfour = /mob/living/carbon/slime/bluespace adulttype = /mob/living/carbon/slime/adult/yellow coretype = /obj/item/slime_extract/yellow @@ -167,9 +167,9 @@ icon_state = "silver baby slime" primarytype = /mob/living/carbon/slime/silver mutationone = /mob/living/carbon/slime/metal - mutationtwo = /mob/living/carbon/slime/bluespace + mutationtwo = /mob/living/carbon/slime/pyrite mutationthree = /mob/living/carbon/slime/blue - mutationfour = /mob/living/carbon/slime/bluespace + mutationfour = /mob/living/carbon/slime/pyrite adulttype = /mob/living/carbon/slime/adult/silver coretype = /obj/item/slime_extract/silver @@ -178,9 +178,9 @@ colour = "silver" primarytype = /mob/living/carbon/slime/silver mutationone = /mob/living/carbon/slime/metal - mutationtwo = /mob/living/carbon/slime/metal + mutationtwo = /mob/living/carbon/slime/pyrite mutationthree = /mob/living/carbon/slime/blue - mutationfour = /mob/living/carbon/slime/blue + mutationfour = /mob/living/carbon/slime/pyrite adulttype = /mob/living/carbon/slime/adult/silver coretype = /obj/item/slime_extract/silver @@ -372,7 +372,7 @@ coretype = /obj/item/slime_extract/adamantine -////////// ??? Tier ////////////// +////////// Even in death I still code Tier ////////////// /mob/living/carbon/slime/bluespace icon_state = "bluespace baby slime" @@ -394,4 +394,70 @@ mutationthree = /mob/living/carbon/slime/bluespace mutationfour = /mob/living/carbon/slime/bluespace adulttype = /mob/living/carbon/slime/adult/bluespace - coretype = /obj/item/slime_extract/bluespace \ No newline at end of file + coretype = /obj/item/slime_extract/bluespace + +/mob/living/carbon/slime/pyrite + icon_state = "pyrite baby slime" + colour = "pyrite" + primarytype = /mob/living/carbon/slime/pyrite + mutationone = /mob/living/carbon/slime/pyrite + mutationtwo = /mob/living/carbon/slime/pyrite + mutationthree = /mob/living/carbon/slime/pyrite + mutationfour = /mob/living/carbon/slime/pyrite + adulttype = /mob/living/carbon/slime/adult/pyrite + coretype = /obj/item/slime_extract/pyrite + +/mob/living/carbon/slime/adult/pyrite + icon_state = "pyrite adult slime" + colour = "pyrite" + primarytype = /mob/living/carbon/slime/pyrite + mutationone = /mob/living/carbon/slime/pyrite + mutationtwo = /mob/living/carbon/slime/pyrite + mutationthree = /mob/living/carbon/slime/pyrite + mutationfour = /mob/living/carbon/slime/pyrite + adulttype = /mob/living/carbon/slime/adult/pyrite + coretype = /obj/item/slime_extract/pyrite + +/mob/living/carbon/slime/cerulean + icon_state = "cerulean baby slime" + colour = "cerulean" + primarytype = /mob/living/carbon/slime/cerulean + mutationone = /mob/living/carbon/slime/cerulean + mutationtwo = /mob/living/carbon/slime/cerulean + mutationthree = /mob/living/carbon/slime/cerulean + mutationfour = /mob/living/carbon/slime/cerulean + adulttype = /mob/living/carbon/slime/adult/cerulean + coretype = /obj/item/slime_extract/cerulean + +/mob/living/carbon/slime/adult/cerulean + icon_state = "cerulean adult slime" + colour = "cerulean" + primarytype = /mob/living/carbon/slime/cerulean + mutationone = /mob/living/carbon/slime/cerulean + mutationtwo = /mob/living/carbon/slime/cerulean + mutationthree = /mob/living/carbon/slime/cerulean + mutationfour = /mob/living/carbon/slime/cerulean + adulttype = /mob/living/carbon/slime/adult/cerulean + coretype = /obj/item/slime_extract/cerulean + +/mob/living/carbon/slime/sepia + icon_state = "sepia baby slime" + colour = "sepia" + primarytype = /mob/living/carbon/slime/sepia + mutationone = /mob/living/carbon/slime/sepia + mutationtwo = /mob/living/carbon/slime/sepia + mutationthree = /mob/living/carbon/slime/sepia + mutationfour = /mob/living/carbon/slime/sepia + adulttype = /mob/living/carbon/slime/adult/sepia + coretype = /obj/item/slime_extract/sepia + +/mob/living/carbon/slime/adult/sepia + icon_state = "sepia adult slime" + colour = "sepia" + primarytype = /mob/living/carbon/slime/sepia + mutationone = /mob/living/carbon/slime/sepia + mutationtwo = /mob/living/carbon/slime/sepia + mutationthree = /mob/living/carbon/slime/sepia + mutationfour = /mob/living/carbon/slime/sepia + adulttype = /mob/living/carbon/slime/adult/sepia + coretype = /obj/item/slime_extract/sepia \ No newline at end of file diff --git a/code/modules/projectiles/projectile/change.dm b/code/modules/projectiles/projectile/change.dm index e76b6f8874f..ed822f7b163 100644 --- a/code/modules/projectiles/projectile/change.dm +++ b/code/modules/projectiles/projectile/change.dm @@ -51,13 +51,19 @@ else new_mob = new /mob/living/carbon/slime(M.loc) new_mob.universal_speak = 1 if("xeno") - var/alien_caste = pick("Hunter","Sentinel","Drone","Larva") + if(prob(50)) + new_mob = new /mob/living/carbon/alien/humanoid/hunter(M.loc) + else + new_mob = new /mob/living/carbon/alien/humanoid/sentinel(M.loc) + new_mob.universal_speak = 1 + + /*var/alien_caste = pick("Hunter","Sentinel","Drone","Larva") switch(alien_caste) if("Hunter") new_mob = new /mob/living/carbon/alien/humanoid/hunter(M.loc) if("Sentinel") new_mob = new /mob/living/carbon/alien/humanoid/sentinel(M.loc) if("Drone") new_mob = new /mob/living/carbon/alien/humanoid/drone(M.loc) else new_mob = new /mob/living/carbon/alien/larva(M.loc) - new_mob.universal_speak = 1 + new_mob.universal_speak = 1*/ if("human") new_mob = new /mob/living/carbon/human(M.loc) if(M.gender == MALE) diff --git a/code/modules/reagents/Chemistry-Recipes.dm b/code/modules/reagents/Chemistry-Recipes.dm index 1b16abb51cf..e43a01446e5 100644 --- a/code/modules/reagents/Chemistry-Recipes.dm +++ b/code/modules/reagents/Chemistry-Recipes.dm @@ -1148,6 +1148,7 @@ datum result_amount = 10 required_container = /obj/item/slime_extract/blue required_other = 1 + //Dark Blue slimefreeze name = "Slime Freeze" @@ -1163,7 +1164,7 @@ datum sleep(50) playsound(get_turf_loc(holder.my_atom), 'sound/effects/phasein.ogg', 100, 1) for(var/mob/living/M in range (get_turf_loc(holder.my_atom), 7)) - M.bodytemperature -= 140 + M.bodytemperature -= 240 M << "\blue You feel a chill!" //Orange @@ -1195,8 +1196,8 @@ datum var/datum/gas_mixture/napalm = new - napalm.toxins = 25 - napalm.temperature = 1400 + napalm.toxins = 50 + napalm.temperature = 2400 target_tile.assume_air(napalm) spawn (0) target_tile.hotspot_expose(700, 400) @@ -1254,8 +1255,6 @@ datum var/obj/item/weapon/slimesteroid/P = new /obj/item/weapon/slimesteroid P.loc = get_turf_loc(holder.my_atom) - - slimejam name = "Slime Jam" id = "m_jam" @@ -1432,6 +1431,63 @@ datum M.client.screen -= blueeffect del(blueeffect) +//Cerulean + + slimepsteroid2 + name = "Slime Steroid 2" + id = "m_steroid2" + result = null + required_reagents = list("plasma" = 5) + result_amount = 1 + required_container = /obj/item/slime_extract/cerulean + required_other = 1 + on_reaction(var/datum/reagents/holder) + var/obj/item/weapon/slimesteroid2/P = new /obj/item/weapon/slimesteroid2 + P.loc = get_turf_loc(holder.my_atom) + +//Sepia + slimecamera + name = "Slime Camera" + id = "m_camera" + result = null + required_reagents = list("plasma" = 5) + result_amount = 1 + required_container = /obj/item/slime_extract/sepia + required_other = 1 + on_reaction(var/datum/reagents/holder) + var/obj/item/device/camera/P = new /obj/item/device/camera + P.loc = get_turf_loc(holder.my_atom) + + slimefilm + name = "Slime Film" + id = "m_film" + result = null + required_reagents = list("blood" = 5) + result_amount = 1 + required_container = /obj/item/slime_extract/sepia + required_other = 1 + on_reaction(var/datum/reagents/holder) + var/obj/item/device/camera_film/P = new /obj/item/device/camera_film + P.loc = get_turf_loc(holder.my_atom) + + +//Pyrite + + slimepaint + name = "Slime Paint" + id = "s_paint" + result = null + required_reagents = list("plasma" = 5) + result_amount = 1 + required_container = /obj/item/slime_extract/pyrite + required_other = 1 + on_reaction(var/datum/reagents/holder) + var/list/paints = typesof(/obj/item/weapon/paint) - /obj/item/weapon/paint + var/chosen = pick(paints) + var/obj/P = new chosen + if(P) + P.loc = get_turf_loc(holder.my_atom) + //////////////////////////////////////////FOOD MIXTURES//////////////////////////////////// diff --git a/html/changelog.html b/html/changelog.html index 43c73e4e84e..e845c129d73 100644 --- a/html/changelog.html +++ b/html/changelog.html @@ -48,6 +48,17 @@ Stuff which is in development and not yet visible to players or just code relate should be listed in the changelog upon commit tho. Thanks. --> +
+

31 January 2013

+

Kor "Even in death I still code" Phaeron updated:

+ +
+ +

27 January 2013

Ikarrus updated:

diff --git a/icons/mob/slimes.dmi b/icons/mob/slimes.dmi index d100d6df628..f9998d6f106 100644 Binary files a/icons/mob/slimes.dmi and b/icons/mob/slimes.dmi differ