-Added sprites for fat hulks and fat lizardmen. Have fun with that, weirdos.

-New carrot in-tray sprites.
-Added define for bottle of adminordrazine and supporting code for injecting adminordrazine into plants. Basically for debugging, so I don't have to spend 10 minutes injecting plants with mutagen each time.
-Raised the passive species-mutation chance slightly. For real this time.
-Added sprites for red and yellow floorbots into aibots.dmi.
-New PDAs for the botanists and librarian. Sprites for cartridges for both too. (There's some work into a botany cartridge but it's commented out for now)

git-svn-id: http://tgstation13.googlecode.com/svn/trunk@3498 316c924e-a436-60f5-8080-3fe189b3f50e
This commit is contained in:
d_h2005@yahoo.com
2012-04-23 20:51:23 +00:00
parent aaa194a7a3
commit 7ebdd0ee6e
10 changed files with 47 additions and 4 deletions
+1 -1
View File
@@ -400,7 +400,7 @@
potency = 10
oneharvest = 1
plant_type = 0
growthstages = 5
growthstages = 3
/obj/item/seeds/amanitamycelium
name = "pack of fly amanita mycelium"
+2
View File
@@ -75,6 +75,7 @@
H.equip_if_possible(new /obj/item/clothing/gloves/botanic_leather(H), H.slot_gloves)
H.equip_if_possible(new /obj/item/clothing/suit/apron(H), H.slot_wear_suit)
H.equip_if_possible(new /obj/item/device/analyzer/plant_analyzer(H), H.slot_s_store)
H.equip_if_possible(new /obj/item/device/pda/botanist(H), H.slot_belt)
return 1
@@ -261,6 +262,7 @@
equip(var/mob/living/carbon/human/H)
if(!H) return 0
H.equip_if_possible(new /obj/item/clothing/under/suit_jacket/red(H), H.slot_w_uniform)
H.equip_if_possible(new /obj/item/device/pda/librarian(H), H.slot_belt)
H.equip_if_possible(new /obj/item/clothing/shoes/black(H), H.slot_shoes)
H.equip_if_possible(new /obj/item/weapon/barcodescanner(H), H.slot_l_hand)
return 1
+17 -2
View File
@@ -104,11 +104,11 @@ obj/machinery/hydroponics/process()
if(src.age > src.myseed.production && (src.age - src.lastproduce) > src.myseed.production && (!src.harvest && !src.dead))
var/m_count = 0
while(m_count < src.mutmod)
if(prob(89))
if(prob(85))
src.mutate()
else if(prob(30))
src.hardmutate()
else if(prob(1))
else if(prob(5))
src.mutatespecie()
m_count++;
if(src.yieldmod > 0 && src.myseed.yield != -1) // Unharvestable shouldn't be harvested
@@ -608,6 +608,21 @@ obj/machinery/hydroponics/attackby(var/obj/item/O as obj, var/mob/user as mob)
if (1 to 10) src.mutatepest()
else user << "Nothing happens..."
// The best stuff there is. For testing/debugging.
if(S.reagents.has_reagent("adminordrazine", 1))
src.waterlevel += round(S.reagents.get_reagent_amount("adminordrazine")*1)
src.health += round(S.reagents.get_reagent_amount("adminordrazine")*1)
src.nutrilevel += round(S.reagents.get_reagent_amount("adminordrazine")*1)
src.pestlevel -= rand(1,5)
src.weedlevel -= rand(1,5)
if(S.reagents.has_reagent("adminordrazine", 5))
switch(rand(100))
if (66 to 100) src.mutatespecie()
if (33 to 65) src.mutateweed()
if (1 to 32) src.mutatepest()
else user << "Nothing happens..."
S.reagents.clear_reagents()
if (src.weedlevel < 0 ) // Make sure it won't go overoboard
src.weedlevel = 0
+10
View File
@@ -124,6 +124,16 @@
icon_state = "pda-lawyer"
ttone = "objection"
/obj/item/device/pda/botanist
//default_cartridge = /obj/item/weapon/cartridge/botanist
icon_state = "pda-hydro"
/obj/item/device/pda/librarian
icon_state = "pda-libb"
desc = "A portable microcomputer by Thinktronic Systems, LTD. This is model is a WGW-11 series e-reader."
note = "Congratulations, your station has chosen the Thinktronic 5290 WGW-11 Series E-reader and Personal Data Assistant!"
silent = 1 //Quiet in the library!
/*
* The Actual PDA
*/
+7
View File
@@ -14,6 +14,7 @@
var/access_clown = 0
var/access_mime = 0
var/access_janitor = 0
// var/access_flora = 0
var/access_reagent_scanner = 0
var/access_remote_door = 0 //Control some blast doors remotely!!
var/remote_door_id = ""
@@ -75,6 +76,12 @@
icon_state = "cart-mi"
access_mime = 1
var/mime_charges = 5
/*
botanist
name = "Green Thumb v4.20"
icon_state = "cart-b"
access_flora = 1
*/
signal
name = "generic signaler cartridge"
+10 -1
View File
@@ -2130,7 +2130,7 @@
reagents.add_reagent("blood", 20, data)
/obj/item/weapon/reagent_containers/glass/bottle/pacid
name = "Polytronic Acid Bottle"
name = "Polytrinic Acid Bottle"
desc = "A small bottle. Contains a small amount of Polytronic Acid"
icon = 'chemical.dmi'
icon_state = "bottle17"
@@ -2138,6 +2138,15 @@
..()
reagents.add_reagent("pacid", 30)
/obj/item/weapon/reagent_containers/glass/bottle/adminordrazine
name = "Adminordrazine Bottle"
desc = "A small bottle. Contains the liquid essence of the gods."
icon = 'drinks.dmi'
icon_state = "holyflask"
New()
..()
reagents.add_reagent("adminordrazine", 30)
/obj/item/weapon/reagent_containers/glass/beaker/cryoxadone
name = "beaker"
Binary file not shown.

Before

Width:  |  Height:  |  Size: 38 KiB

After

Width:  |  Height:  |  Size: 39 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 28 KiB

After

Width:  |  Height:  |  Size: 31 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 127 KiB

After

Width:  |  Height:  |  Size: 126 KiB

BIN
View File
Binary file not shown.

Before

Width:  |  Height:  |  Size: 13 KiB

After

Width:  |  Height:  |  Size: 14 KiB