From af91cffbe6e9a4406baf932e352924e0122366c6 Mon Sep 17 00:00:00 2001 From: "VivianFoxfoot@gmail.com" Date: Wed, 11 Apr 2012 15:26:50 +0000 Subject: [PATCH] Change to secret room spawning to make sure there's actually an asteroid to spawn them in Headwear that covers the eyes now protects drop droppers. git-svn-id: http://tgstation13.googlecode.com/svn/trunk@3436 316c924e-a436-60f5-8080-3fe189b3f50e --- code/game/asteroid/asteroid.dm | 10 ++++- code/game/objects/items/robot_items.dm | 39 +++++++++++++++++++- code/modules/chemical/Chemistry-Tools.dm | 47 +++++++++++++++++++++++- html/changelog.html | 9 +++++ 4 files changed, 99 insertions(+), 6 deletions(-) diff --git a/code/game/asteroid/asteroid.dm b/code/game/asteroid/asteroid.dm index 0c9ef3c9515..81f681b244e 100644 --- a/code/game/asteroid/asteroid.dm +++ b/code/game/asteroid/asteroid.dm @@ -181,6 +181,13 @@ proc/make_mining_asteroid_secret(var/size = 5) var/turf/T = null var/sanity = 0 var/list/room = null + var/list/turfs = null + + + turfs = get_area_turfs(/area/mine/unexplored) + + if(!turfs.len) + return 0 while(!valid) valid = 1 @@ -188,8 +195,7 @@ proc/make_mining_asteroid_secret(var/size = 5) if(sanity > 100) return 0 - - T=pick(get_area_turfs(/area/mine/unexplored)) + T=pick(turfs) if(!T) return 0 diff --git a/code/game/objects/items/robot_items.dm b/code/game/objects/items/robot_items.dm index 0da3953db52..76c89bb9183 100644 --- a/code/game/objects/items/robot_items.dm +++ b/code/game/objects/items/robot_items.dm @@ -142,12 +142,47 @@ user << "\red You cannot directly fill this object." return + + var/trans = 0 + if(ismob(target)) + if(istype(target , /mob/living/carbon/human)) + var/mob/living/carbon/human/victim = target + + var/obj/item/safe_thing = null + if( victim.wear_mask ) + if ( victim.wear_mask.flags & MASKCOVERSEYES ) + safe_thing = victim.wear_mask + if( victim.head ) + if ( victim.head.flags & MASKCOVERSEYES ) + safe_thing = victim.head + if(victim.glasses) + if ( !safe_thing ) + safe_thing = victim.glasses + + if(safe_thing) + if(!safe_thing.reagents) + safe_thing.create_reagents(100) + trans = src.reagents.trans_to(safe_thing, amount_per_transfer_from_this) + + for(var/mob/O in viewers(world.view, user)) + O.show_message(text("\red [] tries to squirt something into []'s eyes, but fails!", user, target), 1) + spawn(5) + src.reagents.reaction(safe_thing, TOUCH) + + + user << "\blue You transfer [trans] units of the solution." + if (src.reagents.total_volume<=0) + filled = 0 + icon_state = "dropper[filled]" + return + + for(var/mob/O in viewers(world.view, user)) - O.show_message(text("\red [] drips something onto []!", user, target), 1) + O.show_message(text("\red [] squirts something into []'s eyes!", user, target), 1) src.reagents.reaction(target, TOUCH) - var/trans = src.reagents.trans_to(target, amount_per_transfer_from_this) + trans = src.reagents.trans_to(target, amount_per_transfer_from_this) user << "\blue You transfer [trans] units of the solution." if (src.reagents.total_volume<=0) filled = 0 diff --git a/code/modules/chemical/Chemistry-Tools.dm b/code/modules/chemical/Chemistry-Tools.dm index 23a18c19157..48192be0713 100644 --- a/code/modules/chemical/Chemistry-Tools.dm +++ b/code/modules/chemical/Chemistry-Tools.dm @@ -798,12 +798,46 @@ user << "\red You cannot directly fill this object." return + var/trans = 0 + if(ismob(target)) + if(istype(target , /mob/living/carbon/human)) + var/mob/living/carbon/human/victim = target + + var/obj/item/safe_thing = null + if( victim.wear_mask ) + if ( victim.wear_mask.flags & MASKCOVERSEYES ) + safe_thing = victim.wear_mask + if( victim.head ) + if ( victim.head.flags & MASKCOVERSEYES ) + safe_thing = victim.head + if(victim.glasses) + if ( !safe_thing ) + safe_thing = victim.glasses + + if(safe_thing) + if(!safe_thing.reagents) + safe_thing.create_reagents(100) + trans = src.reagents.trans_to(safe_thing, amount_per_transfer_from_this) + + for(var/mob/O in viewers(world.view, user)) + O.show_message(text("\red [] tries to squirt something into []'s eyes, but fails!", user, target), 1) + spawn(5) + src.reagents.reaction(safe_thing, TOUCH) + + + user << "\blue You transfer [trans] units of the solution." + if (src.reagents.total_volume<=0) + filled = 0 + icon_state = "dropper[filled]" + return + + for(var/mob/O in viewers(world.view, user)) - O.show_message(text("\red [] drips something onto []!", user, target), 1) + O.show_message(text("\red [] squirts something into []'s eyes!", user, target), 1) src.reagents.reaction(target, TOUCH) - var/trans = src.reagents.trans_to(target, amount_per_transfer_from_this) + trans = src.reagents.trans_to(target, amount_per_transfer_from_this) user << "\blue You transfer [trans] units of the solution." if (src.reagents.total_volume<=0) filled = 0 @@ -2093,6 +2127,15 @@ var/list/data = list("viruses"= list(F)) reagents.add_reagent("blood", 20, data) +/obj/item/weapon/reagent_containers/glass/bottle/pacid + name = "Polytronic Acid Bottle" + desc = "A small bottle. Contains a small amount of Polytronic Acid" + icon = 'chemical.dmi' + icon_state = "bottle17" + New() + ..() + reagents.add_reagent("pacid", 30) + /obj/item/weapon/reagent_containers/glass/beaker/cryoxadone name = "beaker" diff --git a/html/changelog.html b/html/changelog.html index 9d1cdd524fc..c560ed169ad 100644 --- a/html/changelog.html +++ b/html/changelog.html @@ -93,6 +93,15 @@ 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. --> +
+

Wednesday, April 11th

+

PolymorphBlue updated:

+ +
+ +

April 10, the year of our lord 2012

Agouri updated: