mirror of
https://github.com/vgstation-coders/vgstation13.git
synced 2025-12-10 18:32:03 +00:00
Moved the space suits into the clothing module section, will do more later.
Forgot to add the bioprotection to the actual radiation suits. Bedsheets actually use the bedsheet item icon now. Tracking implant ID's work again. Certain Critters can be harvested by the chef's knives for meat. Renamed a few critter files. git-svn-id: http://tgstation13.googlecode.com/svn/trunk@2053 316c924e-a436-60f5-8080-3fe189b3f50e
This commit is contained in:
@@ -70,6 +70,7 @@
|
||||
RunAttack()
|
||||
TakeDamage(var/damage = 0)
|
||||
Target_Attacker(var/target)
|
||||
Harvest(var/obj/item/weapon/W, var/mob/living/user)//Controls havesting things from dead critters
|
||||
|
||||
|
||||
|
||||
@@ -5,7 +5,9 @@ Contains the procs that control attacking critters
|
||||
|
||||
attackby(obj/item/weapon/W as obj, mob/living/user as mob)
|
||||
..()
|
||||
if (!src.alive) return
|
||||
if(!src.alive)
|
||||
Harvest(W,user)
|
||||
return
|
||||
var/damage = 0
|
||||
switch(W.damtype)
|
||||
if("fire") damage = W.force * firevuln
|
||||
@@ -48,7 +50,7 @@ Contains the procs that control attacking critters
|
||||
src.Die()
|
||||
|
||||
|
||||
Die()//Might be more effective to del them and create a dummy item of some sorts
|
||||
Die()
|
||||
if (!src.alive) return
|
||||
src.icon_state += "-dead"
|
||||
src.alive = 0
|
||||
@@ -58,6 +60,12 @@ Contains the procs that control attacking critters
|
||||
src.visible_message("<b>[src]</b> dies!")
|
||||
|
||||
|
||||
Harvest(var/obj/item/weapon/W, var/mob/living/user)
|
||||
if((!W) || (!user)) return 0
|
||||
if(src.alive) return 0
|
||||
return 1
|
||||
|
||||
|
||||
bullet_act(var/obj/item/projectile/Proj)
|
||||
TakeDamage(Proj.damage)
|
||||
|
||||
@@ -39,6 +39,7 @@
|
||||
..()
|
||||
del(src)
|
||||
|
||||
|
||||
/obj/critter/killertomato
|
||||
name = "killer tomato"
|
||||
desc = "Oh shit, you're really fucked now."
|
||||
@@ -53,12 +54,24 @@
|
||||
firevuln = 2
|
||||
brutevuln = 2
|
||||
|
||||
Die()
|
||||
..()
|
||||
new /obj/item/weapon/reagent_containers/food/snacks/tomatomeat(src)
|
||||
if(prob(50))
|
||||
new /obj/item/weapon/reagent_containers/food/snacks/tomatomeat(src)
|
||||
new /obj/item/weapon/reagent_containers/food/snacks/tomatomeat(src)
|
||||
|
||||
Harvest(var/obj/item/weapon/W, var/mob/living/user)
|
||||
if(..())
|
||||
var/success = 0
|
||||
if(istype(W, /obj/item/weapon/butch))
|
||||
new /obj/item/weapon/reagent_containers/food/snacks/tomatomeat(src)
|
||||
success = 1
|
||||
if(istype(W, /obj/item/weapon/kitchenknife))
|
||||
new /obj/item/weapon/reagent_containers/food/snacks/tomatomeat(src)
|
||||
new /obj/item/weapon/reagent_containers/food/snacks/tomatomeat(src)
|
||||
success = 1
|
||||
if(success)
|
||||
for(var/mob/O in viewers(src, null))
|
||||
O.show_message("\red [user.name] cuts apart the [src.name]!", 1)
|
||||
del(src)
|
||||
return 1
|
||||
return 0
|
||||
|
||||
|
||||
|
||||
/obj/critter/spore
|
||||
@@ -76,6 +89,7 @@
|
||||
firevuln = 2
|
||||
brutevuln = 2
|
||||
|
||||
|
||||
Die()
|
||||
src.visible_message("<b>[src]</b> ruptures and explodes!")
|
||||
src.alive = 0
|
||||
@@ -85,10 +99,12 @@
|
||||
explosion(T, -1, -1, 2, 3)
|
||||
del src
|
||||
|
||||
|
||||
ex_act(severity)
|
||||
src.Die()
|
||||
|
||||
|
||||
|
||||
/obj/critter/spesscarp
|
||||
name = "Spess Carp"
|
||||
desc = "Oh shit, you're really fucked now."
|
||||
@@ -109,12 +125,24 @@
|
||||
angertext = "swims at"
|
||||
attacktext = "bites"
|
||||
|
||||
Die()
|
||||
..()
|
||||
new/obj/item/weapon/reagent_containers/food/snacks/carpmeat(src.loc)
|
||||
if(prob(50))
|
||||
new /obj/item/weapon/reagent_containers/food/snacks/carpmeat(src)
|
||||
new /obj/item/weapon/reagent_containers/food/snacks/carpmeat(src)
|
||||
|
||||
Harvest(var/obj/item/weapon/W, var/mob/living/user)
|
||||
if(..())
|
||||
var/success = 0
|
||||
if(istype(W, /obj/item/weapon/butch))
|
||||
new/obj/item/weapon/reagent_containers/food/snacks/carpmeat(src.loc)
|
||||
new/obj/item/weapon/reagent_containers/food/snacks/carpmeat(src.loc)
|
||||
success = 1
|
||||
if(istype(W, /obj/item/weapon/kitchenknife))
|
||||
new/obj/item/weapon/reagent_containers/food/snacks/carpmeat(src.loc)
|
||||
success = 1
|
||||
if(success)
|
||||
for(var/mob/O in viewers(src, null))
|
||||
O.show_message("\red [user.name] cuts apart the [src.name]!", 1)
|
||||
del(src)
|
||||
return 1
|
||||
return 0
|
||||
|
||||
|
||||
|
||||
/obj/critter/spesscarp/elite
|
||||
@@ -125,6 +153,8 @@
|
||||
melee_damage_upper = 20
|
||||
// opensdoors = 1 would give all access dono if want
|
||||
|
||||
|
||||
|
||||
/obj/critter/walkingmushroom
|
||||
name = "Walking Mushroom"
|
||||
desc = "A...huge...mushroom...with legs!?"
|
||||
@@ -139,12 +169,24 @@
|
||||
firevuln = 2
|
||||
brutevuln = 1
|
||||
|
||||
Die()
|
||||
..()
|
||||
new /obj/item/weapon/reagent_containers/food/snacks/hugemushroomslice(src.loc)
|
||||
if(prob(50))
|
||||
new /obj/item/weapon/reagent_containers/food/snacks/hugemushroomslice(src.loc)
|
||||
new /obj/item/weapon/reagent_containers/food/snacks/hugemushroomslice(src.loc)
|
||||
|
||||
Harvest(var/obj/item/weapon/W, var/mob/living/user)
|
||||
if(..())
|
||||
var/success = 0
|
||||
if(istype(W, /obj/item/weapon/butch))
|
||||
new /obj/item/weapon/reagent_containers/food/snacks/hugemushroomslice(src.loc)
|
||||
new /obj/item/weapon/reagent_containers/food/snacks/hugemushroomslice(src.loc)
|
||||
success = 1
|
||||
if(istype(W, /obj/item/weapon/kitchenknife))
|
||||
new /obj/item/weapon/reagent_containers/food/snacks/hugemushroomslice(src.loc)
|
||||
success = 1
|
||||
if(success)
|
||||
for(var/mob/O in viewers(src, null))
|
||||
O.show_message("\red [user.name] cuts apart the [src.name]!", 1)
|
||||
del(src)
|
||||
return 1
|
||||
return 0
|
||||
|
||||
|
||||
|
||||
/obj/critter/lizard
|
||||
|
||||
Reference in New Issue
Block a user