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

Merge remote-tracking branch 'upstream/dev-freeze' into dev

Browse Source 
Conflicts:
	code/game/machinery/computer/computer.dm
	html/changelogs/.all_changelog.yml
This commit is contained in:
PsiOmegaDelta
2015-10-11 17:37:01 +02:00
parent 4ca487e291 5acd0eaab4
commit 27feb09a31
23 changed files with 2522 additions and 2383 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
code/modules/projectiles/projectile/bullets.dm
View File

@@ -136,6 +136,7 @@
/obj/item/projectile/bullet/pistol/rubber //"rubber" bullets
name = "rubber bullet"
check_armour = "melee"
damage = 10
agony = 40
embed = 0
@@ -150,6 +151,7 @@
/obj/item/projectile/bullet/shotgun/beanbag //because beanbags are not bullets
name = "beanbag"
check_armour = "melee"
damage = 20
agony = 60
embed = 0
@@ -234,4 +236,4 @@
/obj/item/projectile/bullet/pistol/cap/process()
loc = null
qdel(src)
qdel(src)