cyberpresidentvanellope/CHOMPStation2
1
0
Fork 0
mirror of https://github.com/CHOMPStation2/CHOMPStation2.git synced 2025-12-12 11:13:16 +00:00
Code Issues Packages Projects Releases Wiki Activity

hydro mutations are fixed thanks to Urist.

Browse Source 
Also....Superxpdude. Check your paths next time for guns. Since you put M1911 with a capital M, but put it with a lowcase m in the pathname. Thus it would not compile.

git-svn-id: http://tgstation13.googlecode.com/svn/trunk@1849 316c924e-a436-60f5-8080-3fe189b3f50e
This commit is contained in:
firecage@hotmail.com
2011-07-14 19:19:16 +00:00
parent 1c3a8a3937
commit 82dcf22d59
4 changed files with 17 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
code/game/machinery/hydroponics.dm
View File

@@ -311,10 +311,10 @@ obj/machinery/hydroponics/proc/mutatespecie() // Mutagent produced a new plant!
else if ( istype(src.myseed, /obj/item/seeds/berryseed )) else if ( istype(src.myseed, /obj/item/seeds/berryseed ))
del(src.myseed) del(src.myseed)
switch(rand(1,100))
if(1 to 50)
src.myseed = new /obj/item/seeds/poisonberryseed src.myseed = new /obj/item/seeds/poisonberryseed
if(51 to 100)
else if ( istype(src.myseed, /obj/item/seeds/berryseed ))
del(src.myseed)
src.myseed = new /obj/item/seeds/glowberryseed src.myseed = new /obj/item/seeds/glowberryseed
else if ( istype(src.myseed, /obj/item/seeds/poisonberryseed )) else if ( istype(src.myseed, /obj/item/seeds/poisonberryseed ))
@@ -323,14 +323,12 @@ obj/machinery/hydroponics/proc/mutatespecie() // Mutagent produced a new plant!
else if ( istype(src.myseed, /obj/item/seeds/tomatoseed )) else if ( istype(src.myseed, /obj/item/seeds/tomatoseed ))
del(src.myseed) del(src.myseed)
switch(rand(1,100))
if(1 to 35)
src.myseed = new /obj/item/seeds/bluetomatoseed src.myseed = new /obj/item/seeds/bluetomatoseed
if(36 to 70)
else if ( istype(src.myseed, /obj/item/seeds/tomatoseed ))
del(src.myseed)
src.myseed = new /obj/item/seeds/bloodtomatoseed src.myseed = new /obj/item/seeds/bloodtomatoseed
if(71 to 100)
else if ( istype(src.myseed, /obj/item/seeds/tomatoseed ))
del(src.myseed)
src.myseed = new /obj/item/seeds/killertomatoseed src.myseed = new /obj/item/seeds/killertomatoseed
else if ( istype(src.myseed, /obj/item/seeds/grapeseed )) else if ( istype(src.myseed, /obj/item/seeds/grapeseed ))

6
code/game/objects/livestock.dm
View File

@@ -444,10 +444,10 @@
desc = "Oh shit, you're really fucked now." desc = "Oh shit, you're really fucked now."
icon_state = "killertomato" icon_state = "killertomato"
species = "killertomato" species = "killertomato"
aggressive = 1 cowardly = 1
health = 75 health = 75
maxhealth = 75 maxhealth = 75
strength = 19 strength = 0
cycle_pause = 10 cycle_pause = 10
patience = 10 patience = 10
view_range = 14 view_range = 14
@@ -460,7 +460,7 @@
new /obj/item/weapon/reagent_containers/food/snacks/tomatomeat(src) new /obj/item/weapon/reagent_containers/food/snacks/tomatomeat(src)
special_attack() special_attack()
if (prob(stun_chance)) if (prob(stun_chance))
target:stunned = max(target:stunned, (strength / 1)) target:stunned = max(target:stunned, (strength / 2))
/obj/livestock/walkingmushroom /obj/livestock/walkingmushroom
name = "Walking Mushroom" name = "Walking Mushroom"

2
code/modules/admin/verbs/debug.dm
View File

@@ -611,7 +611,7 @@ But you can call procs that are of type /mob/living/carbon/human/proc/ for that
M.equip_if_possible(new /obj/item/clothing/glasses/thermal/eyepatch(M), M.slot_glasses) M.equip_if_possible(new /obj/item/clothing/glasses/thermal/eyepatch(M), M.slot_glasses)
M.equip_if_possible(new /obj/item/clothing/mask/cigarette/cigar/havanian(M), M.slot_wear_mask) M.equip_if_possible(new /obj/item/clothing/mask/cigarette/cigar/havanian(M), M.slot_wear_mask)
M.equip_if_possible(new /obj/item/clothing/head/helmet/space/deathsquad/beret(M), M.slot_head) M.equip_if_possible(new /obj/item/clothing/head/helmet/space/deathsquad/beret(M), M.slot_head)
M.equip_if_possible(new /obj/item/weapon/gun/energy/pulse_rifle/m1911(M), M.slot_belt) M.equip_if_possible(new /obj/item/weapon/gun/energy/pulse_rifle/M1911(M), M.slot_belt)
M.equip_if_possible(new /obj/item/weapon/zippo(M), M.slot_r_store) M.equip_if_possible(new /obj/item/weapon/zippo(M), M.slot_r_store)
M.equip_if_possible(new /obj/item/weapon/storage/backpack/satchel(M), M.slot_back) M.equip_if_possible(new /obj/item/weapon/storage/backpack/satchel(M), M.slot_back)

1
tgstation.dme
View File

@@ -131,6 +131,7 @@
#define FILE_DIR "icons/turf" #define FILE_DIR "icons/turf"
#define FILE_DIR "interface" #define FILE_DIR "interface"
#define FILE_DIR "maps" #define FILE_DIR "maps"
#define FILE_DIR "maps/backup"
#define FILE_DIR "sound" #define FILE_DIR "sound"
#define FILE_DIR "sound/ambience" #define FILE_DIR "sound/ambience"
#define FILE_DIR "sound/announcer" #define FILE_DIR "sound/announcer"