Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Adds variants of 10mm ammunition. #5569

Closed
wants to merge 1 commit into from
Closed

Adds variants of 10mm ammunition. #5569

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 3 additions & 1 deletion code/modules/events/spontaneous_appendicitis.dm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,8 @@
continue
if(H.species.virus_immune) //don't count things that are virus immune; they'll just get picked and auto-cure
continue
if(!H.get_int_organ(/obj/item/organ/internal/appendix))
continue
var/foundAlready = 0 //don't infect someone that already has the virus
for(var/datum/disease/D in H.viruses)
foundAlready = 1
Expand All @@ -14,4 +16,4 @@

var/datum/disease/D = new /datum/disease/appendicitis
H.ForceContractDisease(D)
break
break
1 change: 0 additions & 1 deletion code/modules/mob/living/silicon/robot/drone/drone.dm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,6 @@
local_transmit = 1
ventcrawler = 2
magpulse = 1
mob_size = MOB_SIZE_TINY

// We need to keep track of a few module items so we don't need to do list operations
// every time we need them. These get set in New() after the module is chosen.
Expand Down
9 changes: 9 additions & 0 deletions code/modules/projectiles/ammunition/ammo_casings.dm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,6 +27,15 @@
caliber = "10mm"
projectile_type = /obj/item/projectile/bullet/midbullet3

/obj/item/ammo_casing/c10mm/silencer
projectile_type = /obj/item/projectile/bullet/midbullet3/silencer

/obj/item/ammo_casing/c10mm/ap
projectile_type = /obj/item/projectile/bullet/midbullet3/armourpiercing

/obj/item/ammo_casing/c10mm/fire
projectile_type = /obj/item/projectile/bullet/midbullet3/fire

/obj/item/ammo_casing/c9mm
desc = "A 9mm bullet casing."
caliber = "9mm"
Expand Down
16 changes: 16 additions & 0 deletions code/modules/projectiles/ammunition/magazines.dm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -180,6 +180,22 @@
max_ammo = 8
multiple_sprites = 2

/obj/item/ammo_box/magazine/m10mm/fire
name = "pistol magazine (10mm incendiary)"
desc = "A gun magazine. Loaded with rounds which ignite the target."
ammo_type = /obj/item/ammo_casing/c10mm/fire
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

All these types are not defined. Not sure why you removed them; some of their code needed to be removed, but not their underlying types.


/obj/item/ammo_box/magazine/m10mm/silencer
name = "pistol magazine (10mm silencer)"
desc= "A gun magazine. Loaded with rounds which silence the target for a brief duration."
ammo_type = /obj/item/ammo_casing/c10mm/silencer


/obj/item/ammo_box/magazine/m10mm/AP
name = "pistol magazine (10mm AP)"
desc= "A gun magazine. Loaded with rounds which penetrate armour, but are less effective against normal targets"
ammo_type = /obj/item/ammo_casing/c10mm/ap

/obj/item/ammo_box/magazine/m10mm/empty //for maint drops
desc = "A gun magazine. Seems to be broken and can only hold one bullet. Pretty useless."
max_ammo = 1
Expand Down
15 changes: 15 additions & 0 deletions code/modules/projectiles/projectile/bullets.dm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -112,6 +112,21 @@
/obj/item/projectile/bullet/midbullet3
damage = 30

/obj/item/projectile/bullet/midbullet3/silencer/on_hit(atom/target, blocked = 0)
if(..(target, blocked))
var/mob/living/M = target
M.silent += 3

/obj/item/projectile/bullet/midbullet3/armourpiercing
damage = 27
armour_penetration = 40

/obj/item/projectile/bullet/midbullet3/fire/on_hit(atom/target, blocked = 0)
if(..(target, blocked))
var/mob/living/M = target
M.adjust_fire_stacks(1)
M.IgniteMob()

/obj/item/projectile/bullet/heavybullet
damage = 35

Expand Down
4 changes: 4 additions & 0 deletions html/changelogs/AutoChangeLog-pr-5560.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,4 @@
author: Fox McCloud
delete-after: True
changes:
- bugfix: "Fixes drones not being able to bump open doors"
4 changes: 4 additions & 0 deletions html/changelogs/AutoChangeLog-pr-5564.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,4 @@
author: TullyBurnalot
delete-after: True
changes:
- bugfix: "Mobs without appendixes can no longer contract appendicitis"
4 changes: 4 additions & 0 deletions html/changelogs/AutoChangeLog-pr-5565.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,4 @@
author: Krausus
delete-after: True
changes:
- bugfix: "Fixed setting status display alerts through communications consoles."
2 changes: 1 addition & 1 deletion nano/templates/comm_console.tmpl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -87,7 +87,7 @@ Used In File(s): /code/game/machinery/computers/communications.dm
<h3>Alerts</h3>
{{for data.stat_display.alerts}}
<div class="line">
<div class="statusLabel">{{:helper.link(value.label,'alert',{'operation':'setstat','statdisp':'alert','exclamation-triangle':value.alert},null,(value.alert==data.stat_display.type?'linkOn':''))}}</div>
<div class="statusLabel">{{:helper.link(value.label,'exclamation-triangle',{'operation':'setstat','statdisp':'alert','alert':value.alert},null,(value.alert==data.stat_display.type?'linkOn':''))}}</div>
</div>
{{/for}}
<h3>Messages</h3>
Expand Down