cyberpresidentvanellope/Paradise
1
0
Fork 0
mirror of https://github.com/ParadiseSS13/Paradise.git synced 2026-08-30 15:37:36 +01:00
Code Issues Packages Projects Releases Wiki Activity

Adds Paintball Guns (#31184)

Browse Source 
* Paintball Guns

* Linters and cleanbot

* Fixed examine text

Co-authored-by: Luc <89928798+lewcc@users.noreply.github.com>
Signed-off-by: PollardTheDragon <144391971+PollardTheDragon@users.noreply.github.com>

* Fixes decals

* Update code/game/objects/effects/decals/Cleanable/misc_cleanables.dm

Co-authored-by: Luc <89928798+lewcc@users.noreply.github.com>
Signed-off-by: PollardTheDragon <144391971+PollardTheDragon@users.noreply.github.com>

* Update code/modules/projectiles/guns/projectile/toy.dm

Co-authored-by: Pooble <90473506+poobsie@users.noreply.github.com>
Signed-off-by: PollardTheDragon <144391971+PollardTheDragon@users.noreply.github.com>

* Spans

* Clean code fix

* Apply suggestions from code review

Co-authored-by: DGamerL <108773801+DGamerL@users.noreply.github.com>
Signed-off-by: PollardTheDragon <144391971+PollardTheDragon@users.noreply.github.com>

* Removes excess cut

---------

Signed-off-by: PollardTheDragon <144391971+PollardTheDragon@users.noreply.github.com>
Co-authored-by: Luc <89928798+lewcc@users.noreply.github.com>
Co-authored-by: Pooble <90473506+poobsie@users.noreply.github.com>
Co-authored-by: DGamerL <108773801+DGamerL@users.noreply.github.com>
This commit is contained in:
PollardTheDragon
2025-12-26 22:12:03 +00:00
committed by GitHub
co-authored by Luc Pooble DGamerL
parent a0cad405a4
commit 74d723496f
14 changed files with 221 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/modules/projectiles/ammunition/ammo_casings.dm
+21
View File
@@ -409,6 +409,27 @@
muzzle_flash_strength = MUZZLE_FLASH_STRENGTH_NORMAL
muzzle_flash_range = MUZZLE_FLASH_RANGE_NORMAL
/obj/item/ammo_casing/caseless/paintball
name = "paintball"
desc = "Do not aim at the eyes."
projectile_type = /obj/projectile/paintball
muzzle_flash_effect = null
caliber = "paintball"
icon = 'icons/obj/projectiles.dmi'
icon_state = "paintball"
harmful = FALSE
/obj/item/ammo_casing/caseless/pepperball
name = "pepperball"
desc = "Aim at the eyes for maximum effect."
projectile_type = /obj/projectile/pepperball
muzzle_flash_effect = null
caliber = "pepperball"
icon = 'icons/obj/projectiles.dmi'
icon_state = "paintball"
harmful = FALSE
color = "#660000"
/obj/item/ammo_casing/caseless/foam_dart
name = "foam dart"
desc = "It's nerf or nothing! Ages 8 and up."
code/modules/projectiles/ammunition/magazines.dm
+18
View File
@@ -501,6 +501,24 @@
icon_state = "party_drum"
ammo_type = /obj/item/ammo_casing/shotgun/confetti
/obj/item/ammo_box/magazine/paintball
name = "paintball magazine"
desc = "A magazine that holds a large amount of paintballs."
icon = 'icons/obj/guns/toy.dmi'
icon_state = "paintballmag"
ammo_type = /obj/item/ammo_casing/caseless/paintball
caliber = "paintball"
max_ammo = 25
multi_sprite_step = AMMO_BOX_MULTI_SPRITE_STEP_ON_OFF
/obj/item/ammo_box/magazine/paintball/pepperball
name = "pepperball magazine"
desc = "A magazine that holds a large amount of pepperballs."
icon_state = "pepperballmag"
ammo_type = /obj/item/ammo_casing/caseless/pepperball
caliber = "pepperball"
max_ammo = 10
/obj/item/ammo_box/magazine/toy
name = "foam force META magazine"
ammo_type = /obj/item/ammo_casing/caseless/foam_dart