cyberpresidentvanellope/CHOMPStation2
1
0
Fork 0
mirror of https://github.com/CHOMPStation2/CHOMPStation2.git synced 2025-12-10 18:22:39 +00:00
Code Issues Packages Projects Releases Wiki Activity

Combat Refactor (#6910)

Browse Source 
Co-authored-by: Fluff <jasper0601.com@gmail.com>
Co-authored-by: Raeschen <rycoop29@gmail.com>
Co-authored-by: BlackMajor <henrydyer6@hotmail.com>
This commit is contained in:
Theonewhowaits
2023-09-26 09:45:11 -04:00
committed by GitHub
parent 662e11bb01
commit 1f87db4602
40 changed files with 1164 additions and 163 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
modular_chomp/code/modules/mob/living/simple_mob/subtypes/animal/mines.dm Normal file
View File

@@ -0,0 +1,15 @@
/mob/living/simple_mob/animal/space/goose
maxHealth = 15
health = 15
/mob/living/simple_mob/animal/space/bats
maxHealth = 10
health = 10
/mob/living/simple_mob/animal/space/bats/cult/strong
maxHealth = 30
health = 30
/mob/living/simple_mob/animal/space/bear
maxHealth = 62
health = 62

43
modular_chomp/code/modules/mob/living/simple_mob/subtypes/animal/sif.dm Normal file
View File

@@ -0,0 +1,43 @@
/mob/living/simple_mob/animal/sif/shantak
maxHealth = 37
armor_soak = list(
"melee" = 2,
"bullet" = 0,
"laser" = 0,
"energy" = 0,
"bomb" = 0,
"bio" = 0,
"rad" = 0
)
/mob/living/simple_mob/animal/sif/shantak/leader
maxHealth = 62
/mob/living/simple_mob/animal/sif/savik
maxHealth = 62
health = 62
/mob/living/simple_mob/animal/sif/kururak
maxHealth = 100
health = 100
armor_soak = list(
"melee" = 2,
"bullet" = 2,
"laser" = 2,
"energy" = 0,
"bomb" = 0,
"bio" = 0,
"rad" = 0
)
/mob/living/simple_mob/animal/sif/frostfly
maxHealth = 32
health = 32
/mob/living/simple_mob/vore/aggressive/deathclaw
maxHealth = 100
health = 100
/mob/living/simple_mob/vore/aggressive/corrupthound
maxHealth = 100
health = 100

97
modular_chomp/code/modules/mob/living/simple_mob/subtypes/animal/space/alien.dm
View File

@@ -1,8 +1,47 @@
/mob/living/simple_mob/animal/space/alien
maxHealth = 100
health = 100
harm_intent_damage = 5
melee_damage_lower = 25
melee_damage_upper = 25
attack_armor_pen = 15
/mob/living/simple_mob/animal/space/alien/drone
health = 60
melee_damage_lower = 15
melee_damage_upper = 15
/mob/living/simple_mob/animal/space/alien/sentinel
health = 120
melee_damage_lower = 15
melee_damage_upper = 15
/mob/living/simple_mob/animal/space/alien/sentinel/praetorian
maxHealth = 200
health = 200
/mob/living/simple_mob/animal/space/alien/queen
health = 125
maxHealth = 125
melee_damage_lower = 7
melee_damage_upper = 7
/mob/living/simple_mob/animal/space/alien/queen/empress
maxHealth = 200
health = 200
/mob/living/simple_mob/animal/space/alien/queen/empress/mother
maxHealth = 300
health = 300
melee_damage_lower = 7
melee_damage_upper = 12
//what are this things?
/mob/living/simple_mob/animal/space/alien/sentinel/praetorian/echo
name = "alien Echopraetorian"
color = "#424242"
health = 300
maxHealth = 300
health = 150
maxHealth = 150
needs_reload = 1
projectiletype = /obj/item/projectile/sonic/strong
reload_time = 150 SECONDS
@@ -12,8 +51,8 @@
name = "alien Ionic praetorian"
color = "#004cff"
armor = list(melee = 0,bullet = 25,laser = 0,energy = 0,bomb = 0,bio = 100,rad = 100)
health = 350
maxHealth = 350
health = 175
maxHealth = 175
needs_reload = 1
projectiletype = /obj/item/projectile/arc/emp_blast
reload_time = 150 SECONDS
@@ -25,8 +64,8 @@
name = "alien blazing praetorian"
color = "Red"
armor = list(melee = 0, bullet = 0, laser = 25, energy = 0, bomb = 0, bio = 100, rad = 100)
health = 450
maxHealth = 450
health = 225
maxHealth = 225
needs_reload = 1
projectiletype = /obj/item/projectile/energy/fireball
reload_max = 3
@@ -47,10 +86,10 @@
armor_soak = list(melee = -15, bullet = 10, laser = 10, energy = 0, bomb = 0, bio = 0, rad = 0)
base_attack_cooldown = 25
color = "#ff8214"
health = 700
maxHealth = 700
melee_damage_lower = 25
melee_damage_upper = 35
health = 350
maxHealth = 350
melee_damage_lower = 12
melee_damage_upper = 17
movement_cooldown = 10
movement_shake_radius = 7
movement_sound = 'sound/weapons/heavysmash.ogg'
@@ -66,10 +105,10 @@
armor_soak = list(melee = -10, bullet = 10, laser = 5, energy = 0, bomb = 0, bio = 0, rad = 0)
base_attack_cooldown = 15
color = "#38b9ff"
health = 500
maxHealth = 500
melee_damage_lower = 25
melee_damage_upper = 50
health = 250
maxHealth = 250
melee_damage_lower = 12
melee_damage_upper = 25
movement_cooldown = 12
movement_shake_radius = 7
needs_reload = 1
@@ -84,10 +123,10 @@
armor_soak = list(melee = -10, bullet = 10, laser = 5, energy = 0, bomb = 0, bio = 0, rad = 0)
base_attack_cooldown = 25
color = "#4a4a4a"
health = 1250
maxHealth = 1250
melee_damage_lower = 25
melee_damage_upper = 50
health = 625
maxHealth = 625
melee_damage_lower = 12
melee_damage_upper = 25
movement_cooldown = 12
movement_shake_radius = 7
needs_reload = 1
@@ -100,8 +139,8 @@
ai_holder_type = /datum/ai_holder/simple_mob/ranged/careful
armor_soak = list(melee = 0, bullet = 5, laser = 5, energy = 0, bomb = 0, bio = 0, rad = 0)
color = "#ccff4a"
health = 200
maxHealth = 200
health = 100
maxHealth = 100
needs_reload = 1
projectiletype = /obj/item/projectile/beam/stun/electric_spider
reload_max = 5
@@ -113,8 +152,8 @@
armor = list (melee = 0, bullet = 0, laser = 15, energy = 0, bomb = 0, bio = 100, rad = 100)
base_attack_cooldown = 15
color = "#ff7373"
health = 250
maxHealth = 250
health = 125
maxHealth = 125
needs_reload = 1
projectiletype = /obj/item/projectile/bullet/incendiary/dragonflame
reload_max = 2
@@ -125,8 +164,8 @@
ai_holder_type = /datum/ai_holder/simple_mob/ranged/careful
armor = list(melee = 0, bullet = 15, laser = 0, energy = 0, bomb = 0, bio = 100, rad = 100)
color = "#4f83ff"
health = 200
maxHealth = 200
health = 100
maxHealth = 100
needs_reload = 1
projectiletype = /obj/item/projectile/energy/blob/freezing/splattering
reload_max = 3
@@ -137,8 +176,8 @@
projectiletype = /obj/item/projectile/energy/acid
/mob/living/simple_mob/animal/space/alien/tanky
health = 200
maxHealth = 200
health = 100
maxHealth = 100
/mob/living/simple_mob/animal/space/alien/hunterling
name = "alien hunterling"
@@ -156,9 +195,9 @@
name = "alien hunterlisk"
base_attack_cooldown = 15
color = "#575757"
health = 150
maxHealth = 150
melee_damage_upper = 35
health = 75
maxHealth = 75
melee_damage_upper = 17
movement_cooldown = 3
size_multiplier = 1.25

20
modular_chomp/code/modules/mob/living/simple_mob/subtypes/animal/space/mouse_army_ch.dm
View File

@@ -1,3 +1,8 @@
/mob/living/simple_mob/animal/space/mouse_army
maxHealth = 25
health = 25
//Honestly with pretty low damage I am not touching it.
/mob/living/simple_mob/animal/space/mouse_army/operative
icon_state = "mouse_operative"
item_state = "mouse_operative"
@@ -18,10 +23,23 @@
icon_living = "mouse_ammo"
icon_dead = "mouse_ammo_dead"
icon_rest = "mouse_ammo_sleep"
maxHealth = 15
health = 15
/mob/living/simple_mob/animal/space/mouse_army/stealth
icon_state = "mouse_stealth"
item_state = "mouse_stealth"
icon_living = "mouse_stealth"
icon_dead = "mouse_stealth_dead"
icon_rest = "mouse_stealth_sleep"
icon_rest = "mouse_stealth_sleep"
/mob/living/simple_mob/mechanical/mecha/mouse_tank
maxHealth = 75
/mob/living/simple_mob/mechanical/mecha/mouse_tank/livewire
maxHealth = 100
/mob/living/simple_mob/mechanical/mecha/mouse_tank/eraticator
maxHealth = 150

11
modular_chomp/code/modules/mob/living/simple_mob/subtypes/animal/space/other.dm Normal file
View File

@@ -0,0 +1,11 @@
/mob/living/simple_mob/animal/space/carp/large/huge
maxHealth = 115
health = 115
/mob/living/simple_mob/animal/space/ray
maxHealth = 62
health = 62
/mob/living/simple_mob/animal/space/shark
maxHealth = 62
health = 62

115
modular_chomp/code/modules/mob/living/simple_mob/subtypes/animal/spider.dm
View File

@@ -1,52 +1,117 @@
//Unfiying spider health, into two catagories. Disrupters and tanks.
/mob/living/simple_mob/animal/giant_spider/carrier //Disrupter, old 100
maxHealth = 60
health = 60
maxHealth = 30
health = 30
melee_damage_lower = 4
melee_damage_upper = 12
/mob/living/simple_mob/animal/giant_spider/electric //disrupter, old 210
maxHealth = 60
health = 60
maxHealth = 30
health = 30
projectiletype = /obj/item/projectile/energy/mob/electric_spider
melee_damage_lower = 5
melee_damage_upper = 12
/mob/living/simple_mob/animal/giant_spider/frost //tank, old 175
maxHealth = 120
health = 120
maxHealth = 60
health = 60
/mob/living/simple_mob/animal/giant_spider //tank, old 200
maxHealth = 120
health = 120
maxHealth = 60
health = 60
melee_damage_lower = 9
melee_damage_upper = 15
/mob/living/simple_mob/animal/giant_spider/ion //disrupter, old 90
maxHealth = 60
health = 60
maxHealth = 30
health = 30
/mob/living/simple_mob/animal/giant_spider/hunter //disrupter, old 120
maxHealth = 60
health = 60
maxHealth = 30
health = 30
/mob/living/simple_mob/animal/giant_spider/lurker //disrupter, old 100
maxHealth = 60
health = 60
maxHealth = 30
health = 30
/mob/living/simple_mob/animal/giant_spider/pepper //tank, old 210
maxHealth = 120
health = 120
maxHealth = 60
health = 60
/mob/living/simple_mob/animal/giant_spider/phorogenic //tank, old 225
maxHealth = 120
health = 120
maxHealth = 60
health = 60
melee_damage_lower = 12
melee_damage_upper = 20
/mob/living/simple_mob/animal/giant_spider/thermic //tank, old 175
maxHealth = 120
health = 120
/mob/living/simple_mob/animal/giant_spider/tunneler_spider //disrupter, old 120
maxHealth = 60
health = 60
melee_damage_lower = 5
melee_damage_upper = 12
/mob/living/simple_mob/animal/giant_spider/tunneler //disrupter, old 120
maxHealth = 30
health = 30
/mob/living/simple_mob/animal/giant_spider/webslinger //disrupter, old 90
maxHealth = 60
health = 60
maxHealth = 30
health = 30
/obj/effect/spider/eggcluster
spider_type = /obj/effect/spider/spiderling/varied
spider_type = /obj/effect/spider/spiderling/varied
/mob/living/simple_mob/animal/giant_spider/broodmother
maxHealth = 400
health = 400
melee_damage_lower = 12
melee_damage_upper = 20
/mob/living/simple_mob/animal/giant_spider/frost/broodling
maxHealth = 20
health = 20
melee_damage_lower = 5
melee_damage_upper = 7
/mob/living/simple_mob/animal/giant_spider/electric/broodling
maxHealth = 15
health = 15
/mob/living/simple_mob/animal/giant_spider/hunter/broodling
maxHealth = 20
health = 20
/mob/living/simple_mob/animal/giant_spider/lurker/broodling
maxHealth = 20
health = 20
/mob/living/simple_mob/animal/giant_spider/nurse/broodling
maxHealth = 30
health = 30
/mob/living/simple_mob/animal/giant_spider/pepper/broodling
maxHealth = 20
health = 20
/mob/living/simple_mob/animal/giant_spider/thermic/broodling
maxHealth = 20
health = 20
melee_damage_lower = 5
melee_damage_upper = 7
/mob/living/simple_mob/animal/giant_spider/tunneler/broodling
maxHealth = 20
health = 20
/mob/living/simple_mob/animal/giant_spider/webslinger/broodling
maxHealth = 15
health = 15
/mob/living/simple_mob/animal/giant_spider/broodling
maxHealth = 30
health = 30
melee_damage_lower = 5
melee_damage_upper = 10

14
modular_chomp/code/modules/mob/living/simple_mob/subtypes/gateway/imperion.dm
View File

@@ -11,8 +11,8 @@
icon_state = "imperion"
icon_living = "imperion"
desc = "A strange precursor mecha"
maxHealth = 400
health = 400
maxHealth = 200
health = 200
movement_cooldown = -1
unsuitable_atoms_damage = 0
projectiletype = /obj/item/projectile/energy/gaussrifle
@@ -457,8 +457,8 @@
return ..()
/obj/item/shield_projector/rectangle/automatic/imperion
shield_health = 500
max_shield_health = 500
shield_health = 250
max_shield_health = 250
shield_regen_delay = 60 SECONDS
shield_regen_amount = 50
size_x = 2
@@ -483,7 +483,7 @@
/obj/item/projectile/energy/imperionspear
name = "energy spear"
icon_state = "arcane_barrage"
damage = 35
damage = 16
armor_penetration = 35
damage_type = BURN
check_armour = "laser"
@@ -529,7 +529,7 @@
/obj/item/projectile/energy/imperiontesla
name = "energy sphere"
icon_state = "tesla_projectile"
damage = 50
damage = 25
armor_penetration = 50
damage_type = BURN
check_armour = "energy"
@@ -541,7 +541,7 @@
/obj/item/projectile/energy/homing_bolt/missile
name = "homing rocket"
icon_state = "atrocket"
damage = 40
damage = 20
damage_type = BURN
check_armour = "bullet"

48
modular_chomp/code/modules/mob/living/simple_mob/subtypes/gateway/vistors.dm
View File

@@ -3,15 +3,15 @@
icon = 'icons/mob/animal_vg.dmi'
icon_state = "drone3"
icon_living = "drone3"
maxHealth = 50
health = 50
maxHealth = 25
health = 25
movement_cooldown = 0
unsuitable_atoms_damage = 0
projectiletype = /obj/item/projectile/energy/homing_bolt
melee_attack_delay = 4 SECOND
melee_damage_lower = 25
melee_damage_upper = 25
melee_damage_lower = 12
melee_damage_upper = 12
ai_holder_type = /datum/ai_holder/simple_mob/ranged/kiting
wreckage = null
@@ -68,15 +68,15 @@
faction = "vistor"
maxHealth = 150
health = 150
maxHealth = 75
health = 75
movement_cooldown = 0
unsuitable_atoms_damage = 0
projectiletype = /obj/item/projectile/energy/homing_bolt
melee_attack_delay = 4 SECOND
melee_damage_lower = 25
melee_damage_upper = 25
melee_damage_lower = 12
melee_damage_upper = 12
ai_holder_type = /datum/ai_holder/simple_mob/intentional/adv_dark_gygax
armor = list(
@@ -139,8 +139,8 @@
icon = 'icons/mob/animal_vg.dmi'
icon_state = "mushroom"
icon_living = "mushroom"
maxHealth = 200
health = 200
maxHealth = 100
health = 100
movement_cooldown = 0
unsuitable_atoms_damage = 0
projectiletype = /obj/item/projectile/arc/spore
@@ -149,8 +149,8 @@
wreckage = null
pilot_type = null
melee_damage_lower = 25
melee_damage_upper = 25
melee_damage_lower = 12
melee_damage_upper = 12
ai_holder_type = /datum/ai_holder/hostile/ranged/robust
special_attack_cooldown = 2 SECONDS
@@ -170,8 +170,8 @@
icon = 'icons/mob/animal_vg.dmi'
icon_state = "scarybat"
icon_living = "scarybat"
maxHealth = 200
health = 200
maxHealth = 100
health = 100
movement_cooldown = 0
unsuitable_atoms_damage = 0
projectiletype = null
@@ -180,8 +180,8 @@
wreckage = null
pilot_type = null
melee_damage_lower = 25
melee_damage_upper = 25
melee_damage_lower = 12
melee_damage_upper = 12
alpha = 15
loot_list = list(/obj/item/clothing/suit/armor/tesla/vistor = 100
@@ -192,8 +192,8 @@
icon = 'icons/mob/animal.dmi'
icon_state = "chick"
icon_living = "chick"
maxHealth = 50
health = 50
maxHealth = 25
health = 25
movement_cooldown = 0
unsuitable_atoms_damage = 0
projectiletype = null
@@ -203,8 +203,8 @@
pilot_type = null
attack_armor_pen = 25
melee_damage_lower = 10
melee_damage_upper = 40
melee_damage_lower = 5
melee_damage_upper = 20
ai_holder_type = /datum/ai_holder/simple_mob/ranged/kiting
mob_size = MOB_MINISCULE
density = 0
@@ -214,8 +214,8 @@
icon = 'icons/mecha/mecha.dmi'
icon_state = "honker"
icon_living = "honker"
maxHealth = 300
health = 300
maxHealth = 150
health = 150
movement_cooldown = 0
unsuitable_atoms_damage = 0
projectiletype = /obj/item/projectile/energy/gaussrifle
@@ -269,8 +269,8 @@
icon = 'icons/mecha/mecha.dmi'
icon_state = "mime"
icon_living = "mime"
maxHealth = 300
health = 300
maxHealth = 150
health = 150
movement_cooldown = 0
damage_fatigue_mult = 0
alpha = 175

4
modular_chomp/code/modules/mob/living/simple_mob/subtypes/gateway/wizards.dm
View File

@@ -18,8 +18,8 @@
faction = "vr"
maxHealth = 100
health = 100
maxHealth = 50
health = 50
movement_cooldown = 1
unsuitable_atoms_damage = 0
projectiletype = /obj/item/projectile/energy/homing_bolt/wizard

17
modular_chomp/code/modules/mob/living/simple_mob/subtypes/humanoid/cultboss.dm
View File

@@ -1,10 +1,10 @@
/mob/living/simple_mob/humanoid/cultist/magus/rift
name = "Rift Magus"
maxHealth = 450 //Boss Mobs should be tanky.
health = 450
maxHealth = 225 //Boss Mobs should be tanky.
health = 225
melee_damage_lower = 30
melee_damage_upper = 45
melee_damage_lower = 15
melee_damage_upper = 22
attack_armor_pen = 50
var/grenade_type = /obj/item/weapon/grenade/spawnergrenade/riftwallers
var/grenade_timer = 5
@@ -33,10 +33,10 @@
injury_enrages = TRUE
armor_soak = list(
"melee" = 5,
"bullet" = 5,
"laser" = 5,
"energy" = 5,
"melee" = 2,
"bullet" = 2,
"laser" = 2,
"energy" = 2,
"bomb" = 0,
"bio" = 0,
"rad" = 0
@@ -276,6 +276,7 @@
light_range = 2
light_power = -2
light_color = "#FFFFFF"
damage_type = BURN
/mob/living/simple_mob/humanoid/cultist/magus/rift
vore_active = 1

50
modular_chomp/code/modules/mob/living/simple_mob/subtypes/humanoid/cultist_ch.dm
View File

@@ -1,28 +1,52 @@
/mob/living/simple_mob/humanoid/cultist
maxHealth = 75
health = 75
/mob/living/simple_mob/humanoid/cultist/human
movement_cooldown = 1
melee_damage_lower = 15
melee_damage_upper = 15
/mob/living/simple_mob/humanoid/cultist/caster
movement_cooldown = 1
projectiletype = /obj/item/projectile/energy/inversion
melee_damage_lower = 7
melee_damage_upper = 7
/mob/living/simple_mob/humanoid/cultist/tesh
movement_cooldown = -1
melee_damage_lower = 7
melee_damage_upper = 7
maxHealth = 37
health = 37
/mob/living/simple_mob/humanoid/cultist/castertesh
movement_cooldown = -1
projectiletype = /obj/item/projectile/energy/inversion
melee_damage_lower = 7
melee_damage_upper = 7
maxHealth = 37
health = 37
/mob/living/simple_mob/humanoid/cultist/elite
movement_cooldown = 1
melee_damage_lower = 15
melee_damage_upper = 15
/mob/living/simple_mob/humanoid/cultist/magus
movement_cooldown = 1
projectiletype = /obj/item/projectile/energy/inversion
maxHealth = 100
health = 100
melee_damage_lower = 15
melee_damage_upper = 15
/mob/living/simple_mob/humanoid/cultist/hunter
maxHealth = 175 //Ehhh, this AI is like mini-boss at best
health = 175
maxHealth = 87 //Ehhh, this AI is like mini-boss at best
health = 87
movement_cooldown = 0
melee_damage_lower = 21 //Saw Cleaver Brutality
melee_damage_upper = 21
/mob/living/simple_mob/humanoid/cultist/human/bloodjaunt/fireball //Teleporting Cultists, now with fireballs
name = "Burning Mage"
@@ -35,9 +59,8 @@
movement_cooldown = 0
harm_intent_damage = 5
melee_damage_lower = 5
melee_damage_upper = 10
melee_damage_lower = 7
melee_damage_upper = 7
ai_holder_type = /datum/ai_holder/simple_mob/ranged
projectiletype = /obj/item/projectile/energy/fireball
@@ -46,8 +69,8 @@
desc = "An indiuval wrapped up in a makeshift rig, made from fallen cultist."
icon_state = "cobra-cultist"
icon_living = "cobra-cultist"
maxHealth = 150
health = 150
maxHealth = 75
health = 75
faction = "cult"
@@ -58,8 +81,8 @@
response_harm = "hits"
harm_intent_damage = 5
melee_damage_lower = 15
melee_damage_upper = 25
melee_damage_lower = 7
melee_damage_upper = 7
attack_sharp = 1
attack_edge = 1
attacktext = list("slashed", "stabbed")
@@ -70,6 +93,15 @@
movement_cooldown = 2
ai_holder_type = /datum/ai_holder/simple_mob/ranged
/obj/item/shield_projector/rectangle/automatic/magus
name = "cult shield stone"
desc = "A stone wielded by only the most powerful of cult leaders. It projects a shield around the user."
icon = 'icons/obj/device.dmi'
icon_state = "implant_melted"
shield_health = 100
max_shield_health = 100
shield_regen_delay = 10 SECONDS
//Nibbler//
/mob/living/simple_mob/humanoid/cultist/human/bloodjaunt/fireball
vore_active = 1

40
modular_chomp/code/modules/mob/living/simple_mob/subtypes/humanoid/eclipse/eclipse.dm
View File

@@ -22,8 +22,8 @@
response_disarm = "shoves"
response_harm = "hits"
health = 100
maxHealth = 100
health = 50
maxHealth = 50
harm_intent_damage = 5
melee_damage_lower = 15 //Tac Knife damage
melee_damage_upper = 15
@@ -152,8 +152,8 @@
/mob/living/simple_mob/humanoid/eclipse/solar/firemoff
name = "Solar Eclipse Inferno Moth"
desc = "A moth like creature cladded in armor, wisps of flames swirling around it. Protected from lasers and energy."
health = 75
maxHealth = 75
health = 37
maxHealth = 37
icon_state = "eclipse_moth"
icon_living = "eclipse_moth"
reload_max = 10
@@ -172,8 +172,8 @@
/mob/living/simple_mob/humanoid/eclipse/solar/snipertesh
name = "Solar Eclipse Sniper"
desc = "An armored teshari with a sniper, protected from laser and energy based attacks"
health = 50
maxHealth = 50
health = 25
maxHealth = 25
movement_cooldown = -1
icon_state = "eclipse_snipertesh"
@@ -230,8 +230,8 @@
/mob/living/simple_mob/humanoid/eclipse/solar/radiation
name = "Solar Eclipse Irradiator"
desc = "A lizard emitting radiation, whilst protected from it, alongside energy and laser based weapons"
health = 150
maxHealth = 150
health = 75
maxHealth = 75
glow_toggle = TRUE
reload_max = 3
@@ -261,8 +261,8 @@
/mob/living/simple_mob/humanoid/eclipse/lunar/silvernoodle //Bouncing bullet extreme
name = "Lunar Eclipse Silver Serpent"
desc = "A hungry looking naga, their strange armor protecting them from ballistics and physical weaponry."
health = 100
maxHealth = 100
health = 50
maxHealth = 50
reload_max = 6
movement_cooldown = 1
@@ -297,8 +297,8 @@
/mob/living/simple_mob/humanoid/eclipse/lunar/shotgunner //wuff with shotgun
name = "Lunar Eclipse Shotgunner"
desc = "A Vulpkanin or the like in a red-purple flashing rigsuit, it defending them from physical damage of close and long ranges."
health = 75
maxHealth = 75
health = 37
maxHealth = 37
reload_max = 2
icon_state = "eclipse_shotwuff"
@@ -311,8 +311,8 @@
/mob/living/simple_mob/humanoid/eclipse/lunar/bulletstorm //tesh got a gun
name = "Lunar Eclipse Judge"
desc = "A teshari wildly wielding a pistol, wearing bullet and sword protective gear."
health = 50
maxHealth = 50
health = 25
maxHealth = 25
icon_state = "eclipse_shottesh"
icon_living = "eclipse_shottesh"
movement_cooldown = -1
@@ -328,8 +328,8 @@
/mob/living/simple_mob/humanoid/eclipse/lunar/ravanger //Tanky boi. Very deadly melee
name = "Lunar Eclipse Ravanger"
desc = "An individual wearing strange armor that seems to be living, and breathing while providing protection from bullets and swords."
health = 125
maxHealth = 125
health = 62
maxHealth = 62
icon_state = "eclipse_ravanger"
icon_living = "eclipse_ravanger"
@@ -355,8 +355,8 @@
/mob/living/simple_mob/humanoid/eclipse/solar/hellhound
name = "Solar Eclipse Hound"
desc = "A heavily armored creature, flames dancing around it's burn and energy proof armor."
health = 150
maxHealth = 150
health = 75
maxHealth = 75
ai_holder_type = /datum/ai_holder/simple_mob/intentional/adv_dark_gygax
projectiletype = null //Flashing was to much for this mob.
movement_cooldown = -1
@@ -376,8 +376,8 @@
/mob/living/simple_mob/humanoid/eclipse/lunar/wheel
name = "Lunar Eclipse Armadillo"
desc = "A silver armadillo coiled up, and spinning at you, all bullets and close quarters attacks bouncing off."
health = 150
maxHealth = 150
health = 75
maxHealth = 75
melee_damage_lower = 10
melee_damage_upper = 10
attack_armor_pen = 50

6
modular_chomp/code/modules/mob/living/simple_mob/subtypes/humanoid/mercenary.dm
View File

@@ -1,2 +1,6 @@
/mob/living/simple_mob/humanoid/merc/ranged/laser
projectiletype = /obj/item/projectile/energy/mob/midlaser
projectiletype = /obj/item/projectile/energy/mob/midlaser
/mob/living/simple_mob/humanoid/merc
health = 75 // improper cloning
maxHealth = 75

12
modular_chomp/code/modules/mob/living/simple_mob/subtypes/humanoid/pirate.dm
View File

@@ -2,4 +2,14 @@
projectiletype = /obj/item/projectile/energy/mob/heavylaser
/mob/living/simple_mob/humanoid/pirate/captain
projectiletype = /obj/item/projectile/energy/mob/heavylaser
projectiletype = /obj/item/projectile/energy/mob/heavylaser
/mob/living/simple_mob/humanoid/pirate
maxHealth = 75
health = 75
/mob/living/simple_mob/mechanical/mecha/ripley/pirate
maxHealth = 125
/mob/living/simple_mob/mechanical/mecha/ripley/pirate/last_stand_merc //Special version used as a quasi boss fight
maxHealth = 85

7
modular_chomp/code/modules/mob/living/simple_mob/subtypes/humanoid/wierd.dm Normal file
View File

@@ -0,0 +1,7 @@
/mob/living/simple_mob/humanoid/possessed
health = 100
maxHealth = 100
/mob/living/simple_mob/humanoid/russian
health = 75
maxHealth = 75

30
modular_chomp/code/modules/mob/living/simple_mob/subtypes/mechanical/cyber_horror.dm
View File

@@ -1,2 +1,30 @@
/mob/living/simple_mob/mechanical/cyber_horror/corgi
projectiletype = /obj/item/projectile/energy/mob/drone
projectiletype = /obj/item/projectile/energy/mob/drone
/mob/living/simple_mob/mechanical/cyber_horror
maxHealth = 87
health = 87
/mob/living/simple_mob/mechanical/cyber_horror/plasma_cyber_horror
maxHealth = 37
health = 37
/mob/living/simple_mob/mechanical/cyber_horror/ling_cyber_horror
maxHealth = 125
health = 125
melee_damage_lower = 5
melee_damage_upper = 10
/mob/living/simple_mob/mechanical/cyber_horror/grey
maxHealth = 50
health = 50
//Direct Ranged Mob
/mob/living/simple_mob/mechanical/cyber_horror/corgi
maxHealth = 25
health = 25
//Cats and mayhem
/mob/living/simple_mob/mechanical/cyber_horror/cat_cyber_horror
maxHealth = 20
health = 20

23
modular_chomp/code/modules/mob/living/simple_mob/subtypes/mechanical/drones/combat_drone.dm
View File

@@ -23,4 +23,25 @@
/datum/ai_holder/simple_mob/ranged/kiting/threatening/drone_aerostat
threaten_delay = 10 SECOND
threaten_timeout = 30 SECONDS
threaten_timeout = 30 SECONDS
/mob/living/simple_mob/mechanical/combat_drone
maxHealth = 25
health = 25
/mob/living/simple_mob/mechanical/mining_drone
maxHealth = 25
health = 25
//Are this things close enough to drones?
/mob/living/simple_mob/mechanical/viscerator
maxHealth = 7
health = 7
/obj/item/shield_projector/rectangle/automatic/drone
shield_health = 75
max_shield_health = 75
shield_regen_delay = 10 SECONDS
shield_regen_amount = 10
size_x = 1
size_y = 1

4
modular_chomp/code/modules/mob/living/simple_mob/subtypes/mechanical/hivebot/boss.dm
View File

@@ -7,8 +7,8 @@
maxHealth = 15 LASERS_TO_KILL
health = 15 LASERS_TO_KILL
projectiletype = /obj/item/projectile/arc/blue_energy/precusor
melee_damage_lower = 30
melee_damage_upper = 50
melee_damage_lower = 15
melee_damage_upper = 25
special_attack_min_range = 1
special_attack_max_range = 7
special_attack_cooldown = 5 SECONDS

4
modular_chomp/code/modules/mob/living/simple_mob/subtypes/mechanical/hivebot/precusor_hivebots.dm
View File

@@ -45,8 +45,8 @@
color = "#A020F0"
/obj/item/shield_projector/rectangle/automatic/hivebot_drone
shield_health = 100
max_shield_health = 100
shield_health = 50
max_shield_health = 50
shield_regen_delay = 5 SECONDS
shield_regen_amount = 20
size_x = 3

40
modular_chomp/code/modules/mob/living/simple_mob/subtypes/mechanical/mecha/combat.dm
View File

@@ -5,4 +5,42 @@
projectiletype = /obj/item/projectile/energy/mob/heavylaser
/mob/living/simple_mob/mechanical/mecha/hoverpod
projectiletype = /obj/item/projectile/energy/mob/smalllaser
projectiletype = /obj/item/projectile/energy/mob/smalllaser
/mob/living/simple_mob/mechanical/mecha/combat/gygax/dark/advanced
maxHealth = 225
/mob/living/simple_mob/mechanical/mecha/combat/durand
maxHealth = 200
melee_damage_lower = 20
melee_damage_upper = 20
/mob/living/simple_mob/mechanical/mecha/combat/gygax
maxHealth = 150
/mob/living/simple_mob/mechanical/mecha/combat/gygax/dark
maxHealth = 200
/mob/living/simple_mob/mechanical/mecha/combat/marauder
maxHealth = 250
melee_damage_lower = 22
melee_damage_upper = 22
/mob/living/simple_mob/mechanical/mecha/combat/marauder/seraph
health = 550
melee_damage_lower = 27
melee_damage_upper = 27
/mob/living/simple_mob/mechanical/mecha/odysseus
maxHealth = 60
/mob/living/simple_mob/mechanical/mecha/combat
melee_damage_lower = 15
melee_damage_upper = 15
/mob/living/simple_mob/mechanical/mecha/ripley
maxHealth = 100
// Immune to heat damage, resistant to lasers, and somewhat beefier. Still tries to melee you.
/mob/living/simple_mob/mechanical/mecha/ripley/firefighter
maxHealth = 125

4
modular_chomp/code/modules/mob/living/simple_mob/subtypes/mechanical/mecha/phazon.dm
View File

@@ -8,8 +8,8 @@
wreckage = /obj/structure/loot_pile/mecha/phazon
color = "#ffffff"
health = 500
maxHealth = 500
health = 250
maxHealth = 250
evasion = 10
special_attack_min_range = 1

37
modular_chomp/code/modules/mob/living/simple_mob/subtypes/meteroid/meteroid.dm Normal file
View File

@@ -0,0 +1,37 @@
/mob/living/simple_mob/metroid/jellybrig
maxHealth = 200
health = 200
/mob/living/simple_mob/metroid/juvenile/baby
health = 100
maxHealth = 100
/mob/living/simple_mob/metroid/juvenile/super
health = 125
maxHealth = 125
/mob/living/simple_mob/metroid/juvenile/alpha
health = 150
maxHealth = 150
/mob/living/simple_mob/metroid/juvenile/gamma
health = 200
maxHealth = 200
melee_damage_lower = 5
melee_damage_upper = 10
/mob/living/simple_mob/metroid/juvenile/zeta
health = 250
maxHealth = 250
melee_damage_lower = 7
melee_damage_upper = 12
/mob/living/simple_mob/metroid/juvenile/omega
health = 300
maxHealth = 300
melee_damage_lower = 12
melee_damage_upper = 20
/mob/living/simple_mob/metroid/juvenile/queen
health = 500
maxHealth = 500

26
modular_chomp/code/modules/mob/living/simple_mob/subtypes/occult/constructs/construct.dm
View File

@@ -1,2 +1,26 @@
/mob/living/simple_mob/construct/artificer/caster
projectiletype = /obj/item/projectile/energy/inversion
projectiletype = /obj/item/projectile/energy/inversion
/mob/living/simple_mob/construct/artificer
maxHealth = 50
health = 50
melee_damage_lower = 7
melee_damage_upper = 10
/mob/living/simple_mob/construct/harvester
maxHealth = 50
health = 50
melee_damage_lower = 10
melee_damage_upper = 12
/mob/living/simple_mob/construct/wraith
maxHealth = 100
health = 100
melee_damage_lower = 12
melee_damage_upper = 15
/mob/living/simple_mob/construct/harvester/greater
maxHealth = 50
health = 50
melee_damage_lower = 20
melee_damage_upper = 25

14
modular_chomp/code/modules/mob/living/simple_mob/subtypes/occult/constructs/juggernaut.dm
View File

@@ -1,9 +1,19 @@
/mob/living/simple_mob/construct/juggernaut
maxHealth = 100
health = 100
melee_damage_lower = 15
melee_damage_upper = 20
/mob/living/simple_mob/construct/juggernaut/behemoth
maxHealth = 300
health = 300
/mob/living/simple_mob/construct/juggernaut/behemoth/unstoppable
name = "Behemoth"
real_name = "Behemoth"
desc = "The pinnacle of occult technology, Behemoths are nothing shy of both an Immovable Object, and Unstoppable Force."
melee_damage_lower = 45
melee_damage_upper = 65
melee_damage_lower = 22
melee_damage_upper = 33
ai_holder_type = /datum/ai_holder/simple_mob/intentional/adv_dark_gygax
projectiletype = /obj/item/projectile/energy/electrode/cult
movement_cooldown = 1

35
modular_chomp/code/modules/mob/living/simple_mob/subtypes/occult/other.dm Normal file
View File

@@ -0,0 +1,35 @@
/mob/living/simple_mob/creature
maxHealth = 40
health = 40
melee_damage_lower = 8
melee_damage_upper = 15
/mob/living/simple_mob/creature/strong
maxHealth = 160
health = 160
melee_damage_lower = 13
melee_damage_upper = 25
/mob/living/simple_mob/creature/cult/strong
maxHealth = 160
health = 160
melee_damage_lower = 13
melee_damage_upper = 25
/mob/living/simple_mob/faithless
maxHealth = 25
health = 25
melee_damage_lower = 5
melee_damage_upper = 9
/mob/living/simple_mob/faithless/strong
maxHealth = 50
health = 50
melee_damage_lower = 6
melee_damage_upper = 14
/mob/living/simple_mob/faithless/cult/strong
maxHealth = 50
health = 50
melee_damage_lower = 6
melee_damage_upper = 14

2
modular_chomp/code/modules/mob/living/simple_mob/subtypes/slimess/feral.dm
View File

@@ -1,6 +1,6 @@
/mob/living/simple_mob/slime/feral
cores = 3 // Xenobio will love getting their hands on these.
maxHealth = 150
maxHealth = 75
movement_cooldown = 0
melee_damage_lower = 15
melee_damage_upper = 15

8
modular_chomp/code/modules/mob/living/simple_mob/subtypes/vore/bigdragon.dm
View File

@@ -61,4 +61,10 @@
overlay_colors["Eyes"] = input_style_list[11]
catch
eyes = input_style_list[12]
build_icons()
build_icons()
//Most intresting set of OG melee damages
/mob/living/simple_mob/vore/bigdragon
melee_damage_lower = 12
melee_damage_upper = 17
maxHealth = 400

6
modular_chomp/code/modules/mob/living/simple_mob/subtypes/vore/demon.dm Normal file
View File

@@ -0,0 +1,6 @@
/mob/living/simple_mob/vore/demonAI
maxHealth = 100
health = 100
melee_damage_lower = 5
melee_damage_upper = 10

14
modular_chomp/code/modules/mob/living/simple_mob/subtypes/vore/event.dm
View File

@@ -276,4 +276,16 @@
vore_active = 1
vore_capacity = 1
vore_pounce_chance = 0
vore_default_mode = DM_DIGEST
vore_default_mode = DM_DIGEST
/mob/living/simple_mob/vore/aggressive/rat
maxHealth = 75
health = 75
/mob/living/simple_mob/vore/aggressive/rat/phoron
maxHealth = 87
health = 87
/mob/living/simple_mob/vore/aggressive/rat/event
maxHealth = 25
health = 25

24
modular_chomp/code/modules/mob/living/simple_mob/subtypes/vore/gateway/candy.dm
View File

@@ -23,8 +23,8 @@
faction = "candy"
maxHealth = 50
health = 50
maxHealth = 25
health = 25
movement_cooldown = 2
melee_attack_delay = 3 SECOND
can_be_drop_prey = TRUE
@@ -206,8 +206,8 @@
icon_living = "blue"
icon_dead = "blue_dead"
maxHealth = 50
health = 50
maxHealth = 25
health = 25
melee_damage_lower = 7
melee_damage_upper = 12
@@ -230,8 +230,8 @@
icon_living = "red"
icon_dead = "red_dead"
maxHealth = 125
health = 125
maxHealth = 82
health = 82
melee_damage_lower = 2
melee_damage_upper = 2
@@ -259,8 +259,8 @@
icon_living = "yellow"
icon_dead = "yellow_dead"
maxHealth = 50
health = 50
maxHealth = 25
health = 25
melee_damage_lower = 8
melee_damage_upper = 15
@@ -307,8 +307,8 @@
icon_living = "purple"
icon_dead = "purple_dead"
maxHealth = 50
health = 50
maxHealth = 25
health = 25
melee_damage_lower = 7
melee_damage_upper = 12
@@ -333,8 +333,8 @@
ai_holder_type = /datum/ai_holder/simple_mob/ranged/kiting
maxHealth = 50
health = 50
maxHealth = 25
health = 25
melee_damage_lower = 4
melee_damage_upper = 8

4
modular_chomp/code/modules/mob/living/simple_mob/subtypes/vore/wolf.dm
View File

@@ -3,5 +3,5 @@
verbs += /mob/living/simple_mob/proc/pick_color
/mob/living/simple_mob/vore/wolf/direwolf
maxHealth = 100
health = 100
maxHealth = 50
health = 50

4
modular_chomp/code/modules/projectiles/clockwork/clockwork_guns_ch.dm
View File

@@ -49,7 +49,7 @@
/obj/item/projectile/bullet/rifle/clockwork
fire_sound = 'modular_chomp/sound/weapons/clockwork/cwc_rifle_fire.ogg'
damage = 20
damage = 10
hud_state = "rifle_heavy"
/obj/item/projectile/beam/shock/clockwork
@@ -62,7 +62,7 @@
tracer_type = /obj/effect/projectile/tracer/voltbeam
impact_type = /obj/effect/projectile/impact/voltbeam
damage = 40
damage = 20
agony = 15
eyeblur = 2
hitsound = 'sound/effects/lightningshock.ogg'

230
modular_chomp/code/modules/projectiles/guns/ammo.dm Normal file
View File

@@ -0,0 +1,230 @@
/obj/item/ammo_magazine/mfoam_dart/pistol
max_ammo = 22
/obj/item/ammo_magazine/mfoam_dart/smg
max_ammo = 50
/obj/item/ammo_magazine/s357
max_ammo = 15
/obj/item/ammo_magazine/s38
max_ammo = 15
// Makarov
/obj/item/ammo_magazine/m38/makarov
max_ammo = 20
/obj/item/ammo_magazine/m38/giskard
max_ammo = 25
/obj/item/ammo_magazine/m45
max_ammo = 17
/obj/item/ammo_magazine/m45uzi
max_ammo = 40
/obj/item/ammo_magazine/m45tommy
max_ammo = 50
/obj/item/ammo_magazine/m45tommydrum
max_ammo = 125
/obj/item/ammo_magazine/clip/c45
max_ammo = 22
/obj/item/ammo_magazine/s45
max_ammo = 15
/obj/item/ammo_magazine/m5mmcaseless
max_ammo = 75
/obj/item/ammo_magazine/m9mm
max_ammo = 25
/obj/item/ammo_magazine/m9mm/large
max_ammo = 42
/obj/item/ammo_magazine/m9mm/compact
max_ammo = 20
/obj/item/ammo_magazine/m9mm/luger
max_ammo = 20
/obj/item/ammo_magazine/m9mmt
max_ammo = 50
/obj/item/ammo_magazine/clip/c9mm
max_ammo = 22
/obj/item/ammo_magazine/m9mmAdvanced
max_ammo = 52
/obj/item/ammo_magazine/m10mm
max_ammo = 50
/obj/item/ammo_magazine/m10mm/pistol
max_ammo = 30
/obj/item/ammo_magazine/m545
max_ammo = 50
/obj/item/ammo_magazine/m545/ext
max_ammo = 80
/obj/item/ammo_magazine/m545/practice/ext
max_ammo = 75
/obj/item/ammo_magazine/m545/ap/ext
max_ammo = 75
/obj/item/ammo_magazine/m545/hunter/ext
max_ammo = 75
/obj/item/ammo_magazine/m545/small
max_ammo = 25
/obj/item/ammo_magazine/clip/c545
max_ammo = 12
/obj/item/ammo_magazine/m545saw
max_ammo = 150
/obj/item/ammo_magazine/m44
max_ammo = 17
/obj/item/ammo_magazine/clip/c44
max_ammo = 22
/obj/item/ammo_magazine/s44
max_ammo = 15
/obj/item/ammo_magazine/m762
max_ammo = 25
/obj/item/ammo_magazine/m762/ext
max_ammo = 50
/obj/item/ammo_magazine/m762enbloc
max_ammo = 20
/obj/item/ammo_magazine/clip/c762
max_ammo = 12
/obj/item/ammo_magazine/m762svd
max_ammo = 30
/obj/item/ammo_magazine/m12gdrum
max_ammo = 60
/obj/item/ammo_magazine/clip/c12g
max_ammo = 5
/obj/item/ammo_magazine/m75
max_ammo = 10
//zz_magazines
/obj/item/ammo_magazine/a57p90
max_ammo = 125
/obj/item/ammo_magazine/m10mm
max_ammo = 50
/obj/item/ammo_magazine/a57
max_ammo = 50
/obj/item/ammo_magazine/mp5mag
max_ammo = 75
/obj/item/ammo_magazine/pitchmag
max_ammo = 75
/obj/item/ammo_magazine/asval
max_ammo = 50
/obj/item/ammo_magazine/akm
max_ammo = 75
/obj/item/ammo_magazine/akm/rubber
max_ammo = 75
/obj/item/ammo_magazine/ak74
max_ammo = 75
/obj/item/ammo_magazine/m16
max_ammo = 75
/obj/item/ammo_magazine/m16/patriot
max_ammo = 250
/obj/item/ammo_magazine/m41
max_ammo = 100
/obj/item/ammo_magazine/m41/rubber
max_ammo = 100
/obj/item/ammo_magazine/t12
max_ammo = 100
/obj/item/ammo_magazine/clip/sks
max_ammo = 25
/obj/item/ammo_magazine/clip/mosin
max_ammo = 12
/obj/item/ammo_magazine/type901
max_ammo = 75
/obj/item/ammo_magazine/ar10
max_ammo = 50
/obj/item/ammo_magazine/fal
max_ammo = 50
/obj/item/ammo_magazine/awp
max_ammo = 12
/obj/item/ammo_magazine/hectate
max_ammo = 17
/obj/item/ammo_magazine/ppsh
max_ammo = 177
/obj/item/ammo_magazine/plamya
max_ammo = 125
/obj/item/ammo_magazine/strela
max_ammo = 17
/obj/item/ammo_magazine/molniya
max_ammo = 250
/obj/item/ammo_magazine/kord
max_ammo = 250
/obj/item/ammo_magazine/pkm
max_ammo = 250
/obj/item/ammo_magazine/rpd
max_ammo = 250
/obj/item/ammo_magazine/akm/drum
max_ammo = 187
/obj/item/ammo_magazine/ssp4
max_ammo = 20
/obj/item/ammo_magazine/makarov
max_ammo = 20
/obj/item/ammo_magazine/m9mm/vp70
max_ammo = 37
/obj/item/ammo_magazine/tp23s
max_ammo = 25
/obj/item/ammo_magazine/tp23
max_ammo = 35
/obj/item/ammo_magazine/s45lc
max_ammo = 15

81
modular_chomp/code/modules/projectiles/guns/beam.dm Normal file
View File

@@ -0,0 +1,81 @@
/obj/item/projectile/beam
damage = 20
/obj/item/projectile/beam/weaklaser
damage = 10
armor_penetration = -25
/obj/item/projectile/beam/smalllaser
damage = 10
/obj/item/projectile/beam/burstlaser
damage = 10
armor_penetration = 10
/obj/item/projectile/beam/midlaser
damage = 20
armor_penetration = 20
/obj/item/projectile/beam/heavylaser
damage = 25
armor_penetration = 30
/obj/item/projectile/beam/heavylaser/cannon
damage = 30
armor_penetration = 50
/obj/item/projectile/beam/xray
damage = 20
armor_penetration = 50
/obj/item/projectile/beam/gamma
damage = 6
armor_penetration = 90
/obj/item/projectile/beam/cyan
damage = 20
/obj/item/projectile/beam/sniper
damage = 20
armor_penetration = 40
/obj/item/projectile/beam/precursor
damage = 25
/obj/item/projectile/beam/phaser //The "medium" phaser beam.
damage = 10
SA_bonus_damage = 10
/obj/item/projectile/beam/phaser/light
damage = 5
SA_bonus_damage = 5
/obj/item/projectile/beam/phaser/heavy
damage = 12
SA_bonus_damage = 12
/obj/item/projectile/beam/phaser/heavy/cannon
damage = 15
SA_bonus_damage = 15
/obj/item/projectile/scatter/laser
damage = 20
submunition_spread_max = 40
submunition_spread_min = 10
submunitions = list(
/obj/item/projectile/beam/prismatic = 4
)
/obj/item/projectile/beam/prismatic
name = "prismatic beam"
icon_state = "omnilaser"
damage = 5
damage_type = BURN
check_armour = "laser"
light_color = "#00C6FF"

129
modular_chomp/code/modules/projectiles/guns/bullet.dm Normal file
View File

@@ -0,0 +1,129 @@
/obj/item/projectile/bullet
damage = 25 //seems many bullets use this vaule for some reason
/obj/item/projectile/bullet/pistol
damage = 10
/obj/item/projectile/bullet/pistol/ap
damage = 5
armor_penetration = 30
/obj/item/projectile/bullet/pistol/hp
damage = 15
armor_penetration = -50
/obj/item/projectile/bullet/pistol/medium
damage = 15
/obj/item/projectile/bullet/pistol/medium/ap
damage = 10
armor_penetration = 15
/obj/item/projectile/bullet/pistol/medium/hp
damage = 20
armor_penetration = -50
/obj/item/projectile/bullet/pistol/strong
damage = 30
/obj/item/projectile/bullet/pistol/rubber/strong
damage = 10
agony = 60
/obj/item/projectile/bullet/pistol/rubber
damage = 5
agony = 40
embed_chance = 0
/obj/item/projectile/bullet/shotgun
damage = 30
armor_penetration = 40
/obj/item/projectile/bullet/shotgun/beanbag
damage = 5
agony = 60
embed_chance = 0
/obj/item/projectile/bullet/pellet/shotgun
damage = 6
pellets = 6
range_step = 1
spread_step = 10
/obj/item/projectile/bullet/pellet/shotgun/flak
damage = 2
range_step = 2
spread_step = 30
armor_penetration = 10
/obj/item/projectile/bullet/shotgun/ion
damage = 15
/* "Rifle" rounds */
/obj/item/projectile/bullet/rifle
armor_penetration = 15
penetrating = 1
/obj/item/projectile/bullet/rifle/a762
damage = 25
/obj/item/projectile/bullet/rifle/a762/sniper
hitscan = 1
/obj/item/projectile/bullet/rifle/a762/ap
damage = 20
armor_penetration = 50
/obj/item/projectile/bullet/rifle/a762/hp
damage = 30
armor_penetration = -50
penetrating = 0
/obj/item/projectile/bullet/rifle/a762/hunter
damage = 10
SA_bonus_damage = 30
/obj/item/projectile/bullet/rifle/a545
damage = 20
/obj/item/projectile/bullet/rifle/a545/ap
damage = 15
armor_penetration = 50
/obj/item/projectile/bullet/rifle/a545/hp
damage = 30
armor_penetration = -50
penetrating = 0
/obj/item/projectile/bullet/rifle/a545/hunter
damage = 5
SA_bonus_damage = 25
/obj/item/projectile/bullet/rifle/a145
damage = 60
stun = 3
weaken = 3
penetrating = 5
armor_penetration = 80
/obj/item/projectile/bullet/rifle/a145/highvel
damage = 20
stun = 3
weaken = 3
penetrating = 20
armor_penetration = 90
/obj/item/projectile/bullet/rifle/a44rifle
damage = 30
/obj/item/projectile/bullet/pellet
damage = 10
/obj/item/projectile/bullet/pellet/fragment
damage = 5
muzzle_type = null
/obj/item/projectile/bullet/pellet/fragment/strong
damage = 7

49
modular_chomp/code/modules/projectiles/guns/energy.dm Normal file
View File

@@ -0,0 +1,49 @@
//I think most of the energy weapons are security but I regonize a few of this from the aliens and drones.
/obj/item/projectile/energy/excavate
damage = 20
armor_penetration = 60
/obj/item/projectile/energy/excavate/weak
damage = 10
excavation_amount = 100
/obj/item/projectile/energy/acid
damage = 15
/obj/item/projectile/energy/neurotoxin/toxic
damage = 10
/obj/item/projectile/energy/phase/bolt
range = 4
SA_bonus_damage = 15 // 30 total on animals
icon_state = "cbbolt"
hud_state = "taser"
/obj/item/projectile/energy/phase/bolt/heavy
range = 4
SA_bonus_damage = 25 // 20 total on animals
hud_state = "taser"
/obj/item/projectile/energy/plasma/vepr
damage = 30
armor_penetration = 15
/obj/item/projectile/energy/phase
damage = 5
SA_bonus_damage = 15
armor_penetration = 0
SA_vulnerability = list(SA_ANIMAL, MOB_CLASS_SYNTHETIC, MOB_CLASS_ABERRATION)
/obj/item/projectile/energy/phase/light
SA_bonus_damage = 5
armor_penetration = 0
/obj/item/projectile/energy/phase/heavy
damage = 5
SA_bonus_damage = 20
armor_penetration = 0
/obj/item/projectile/energy/phase/heavy/cannon
damage = 5
SA_bonus_damage = 35
armor_penetration = 0

38
modular_chomp/code/modules/projectiles/guns/magnetic.dm Normal file
View File

@@ -0,0 +1,38 @@
//Oh this are apparently a thing
// Rod for railguns. Slightly less nasty than the sniper round.
/obj/item/projectile/bullet/magnetic
damage = 33
/obj/item/projectile/bullet/magnetic/slug
damage = 37
/obj/item/projectile/bullet/magnetic/flechette
damage = 10
/obj/item/projectile/bullet/magnetic/flechette/small
damage = 6
/obj/item/projectile/bullet/magnetic/flechette/small/khi
damage = 9
/obj/item/projectile/bullet/magnetic/flechette/hunting
armor_penetration = 15
SA_bonus_damage = 20
/obj/item/projectile/bullet/magnetic/heated/weak
damage = 7
/obj/item/projectile/bullet/magnetic/fuelrod
damage = 15
/obj/item/projectile/bullet/magnetic/fuelrod/tritium
damage = 20
/obj/item/projectile/bullet/magnetic/fuelrod/phoron
damage = 17
/obj/item/projectile/bullet/magnetic/fuelrod/supermatter
damage = 7
/obj/item/projectile/bullet/magnetic/bore
damage = 10

8
modular_chomp/code/modules/projectiles/mob.dm
View File

@@ -6,7 +6,7 @@
icon_state = "impact_beam_heavy"
fire_sound = 'sound/weapons/lasercannonfire.ogg'
pass_flags = PASSTABLE | PASSGLASS | PASSGRILLE
damage = 60
damage = 25
armor_penetration = 30
light_range = 3
light_power = 1
@@ -17,7 +17,7 @@
icon_state = "impact_laser"
fire_sound = 'sound/weapons/Laser.ogg'
pass_flags = PASSTABLE | PASSGLASS | PASSGRILLE
damage = 40
damage = 20
armor_penetration = 10
damage_type = BURN
check_armour = "laser"
@@ -27,7 +27,7 @@
icon_state = "impact_laser"
fire_sound = 'sound/weapons/Laser.ogg'
pass_flags = PASSTABLE | PASSGLASS | PASSGRILLE
damage = 30
damage = 10
armor_penetration = 0
damage_type = BURN
check_armour = "laser"
@@ -74,7 +74,7 @@
light_color = "#FF0099"
hud_state = "plasma_rifle"
damage = 48
damage = 25
armor_penetration = 10