cyberpresidentvanellope/Paradise
1
0
Fork 0
mirror of https://github.com/ParadiseSS13/Paradise.git synced 2026-07-20 19:44:09 +01:00
Code Issues Packages Projects Releases Wiki Activity

massive burndown (#29894)

Browse Source
This commit is contained in:
Contrabang
2025-07-27 13:52:39 -07:00
committed by GitHub
parent a596fba80d
commit 1504ed98be
1043 changed files with 0 additions and 3598 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/modules/projectiles/ammunition/ammo_boxes.dm
-8
View File
@@ -3,7 +3,6 @@
desc = "A small device designed to quickly reload revolvers. Seven round capacity."
materials = list()
ammo_type = /obj/item/ammo_casing/a357
max_ammo = 7
multi_sprite_step = 1 // see: /obj/item/ammo_box/update_icon()
icon_state = "357"
@@ -12,7 +11,6 @@
desc = "An ammunition box filled with .357 magnum rounds, commonly used in high-caliber revolvers."
w_class = WEIGHT_CLASS_NORMAL
ammo_type = /obj/item/ammo_casing/a357
max_ammo = 7
multi_sprite_step = 1
icon_state = "357_box"
@@ -27,7 +25,6 @@
/obj/item/ammo_box/c10mm
name = "ammo box (10mm)"
desc = "An ammunition box filled with 10mm pistol cartridges, commonly used in Syndicate handguns."
icon_state = "10mmbox"
origin_tech = "combat=2"
ammo_type = /obj/item/ammo_casing/c10mm
max_ammo = 20
@@ -114,7 +111,6 @@
icon_state = "slugloader"
origin_tech = "combat=2"
ammo_type = /obj/item/ammo_casing/shotgun
max_ammo = 7
materials = list(MAT_METAL=28000)
multi_sprite_step = 1
@@ -129,7 +125,6 @@
desc = "A specialized speedloader for swiftly reloading shotguns. This one is meant for Confetti shot."
icon_state = "partyloader"
ammo_type = /obj/item/ammo_casing/shotgun/confetti
multi_sprite_step = 1
/obj/item/ammo_box/shotgun/dragonsbreath
name = "shotgun speedloader (Dragonsbreath)"
@@ -184,10 +179,8 @@
/obj/item/ammo_box/foambox/sniper
name = "ammo box (Foam Sniper Darts)"
desc = "An ammunition box full of sniper darts for toy weapons."
icon = 'icons/obj/guns/toy.dmi'
icon_state = "foambox_sniper"
ammo_type = /obj/item/ammo_casing/caseless/foam_dart/sniper
max_ammo = 40
materials = list(MAT_METAL = 900)
/obj/item/ammo_box/foambox/sniper/riot
@@ -201,5 +194,4 @@
desc = "A revolver speedloader for a cap gun. Cannot chamber live ammunition."
icon_state = "357"
ammo_type = /obj/item/ammo_casing/cap
max_ammo = 7
multi_sprite_step = 1
code/modules/projectiles/ammunition/ammo_casings.dm
-7
View File
@@ -77,7 +77,6 @@
desc = "A 9mm pistol cartridge, commonly used in handguns and submachine guns."
caliber = "9mm"
projectile_type = /obj/item/projectile/bullet/weakbullet3
muzzle_flash_strength = MUZZLE_FLASH_STRENGTH_WEAK
muzzle_flash_range = MUZZLE_FLASH_RANGE_NORMAL
/obj/item/ammo_casing/c9mm/ap
@@ -101,7 +100,6 @@
desc = "A 4.6x30mm PDW cartridge, commonly used in submachine guns and small-caliber rifles."
caliber = "4.6x30mm"
projectile_type = /obj/item/projectile/bullet/weakbullet3
muzzle_flash_strength = MUZZLE_FLASH_STRENGTH_WEAK
muzzle_flash_range = MUZZLE_FLASH_RANGE_NORMAL
/obj/item/ammo_casing/c46x30mm/ap
@@ -239,7 +237,6 @@
projectile_type = /obj/item/projectile/bullet/incendiary/shell/dragonsbreath
pellets = 4
variance = 35
muzzle_flash_color = LIGHT_COLOR_FIRE
/obj/item/ammo_casing/shotgun/ion
name = "ion shell"
@@ -490,7 +487,6 @@
/obj/item/ammo_casing/caseless/foam_dart/sniper/riot
name = "riot foam sniper dart"
desc = "For the bigger brother of the crowd control toy. Ages 18 and up."
caliber = "foam_force_sniper"
projectile_type = /obj/item/projectile/bullet/reusable/foam_dart/sniper/riot
icon_state = "foamdartsniper_riot"
@@ -518,7 +514,6 @@
caliber = "laser"
projectile_type = /obj/item/projectile/beam/laser/ik //Subtype that breaks on firing if emp'd
muzzle_flash_effect = /obj/effect/temp_visual/target_angled/muzzle_flash/energy
muzzle_flash_strength = MUZZLE_FLASH_STRENGTH_WEAK
muzzle_flash_range = MUZZLE_FLASH_RANGE_NORMAL
muzzle_flash_color = LIGHT_COLOR_DARKRED
icon_state = "lasercasing"
@@ -528,6 +523,4 @@
desc = "You shouldn't see this! Make an issue report on Github!"
caliber = "c_foam"
projectile_type = /obj/item/projectile/c_foam
muzzle_flash_strength = MUZZLE_FLASH_RANGE_WEAK
muzzle_flash_range = MUZZLE_FLASH_RANGE_WEAK
muzzle_flash_color = LIGHT_COLOR_DARKRED
code/modules/projectiles/ammunition/energy_lens.dm
-10
View File
@@ -48,7 +48,6 @@
projectile_type = /obj/item/projectile/beam/scatter/eshotgun
pellets = 6
variance = 25
select_name = "kill"
delay = 1 SECONDS
/obj/item/ammo_casing/energy/laser/eshotgun/cyborg
@@ -91,7 +90,6 @@
/obj/item/ammo_casing/energy/xray
projectile_type = /obj/item/projectile/beam/xray
muzzle_flash_color = LIGHT_COLOR_GREEN
e_cost = 100
fire_sound = 'sound/weapons/laser3.ogg'
/obj/item/ammo_casing/energy/immolator
@@ -101,7 +99,6 @@
/obj/item/ammo_casing/energy/immolator/strong
projectile_type = /obj/item/projectile/beam/immolator/strong
e_cost = 125
select_name = "precise"
/obj/item/ammo_casing/energy/immolator/strong/cyborg
@@ -110,7 +107,6 @@
/obj/item/ammo_casing/energy/immolator/scatter
projectile_type = /obj/item/projectile/beam/immolator/weak
e_cost = 125
pellets = 6
variance = 25
select_name = "scatter"
@@ -204,11 +200,7 @@
/obj/item/ammo_casing/energy/disabler/eshotgun
projectile_type = /obj/item/projectile/beam/disabler/pellet
muzzle_flash_color = LIGHT_COLOR_LIGHTBLUE
select_name = "disable"
e_cost = 75
fire_sound = 'sound/weapons/taser2.ogg'
harmful = FALSE
delay = 1 SECONDS
pellets = 6
variance = 25
@@ -237,7 +229,6 @@
projectile_type = /obj/item/projectile/beam/wormhole
muzzle_flash_color = "#33CCFF"
delay = 10
e_cost = 100
fire_sound = 'sound/weapons/pulse3.ogg'
var/obj/item/gun/energy/wormhole_projector/gun = null
select_name = "blue"
@@ -327,7 +318,6 @@
projectile_type = /obj/item/projectile/beam/emitter
muzzle_flash_color = LIGHT_COLOR_GREEN
fire_sound = 'sound/weapons/emitter.ogg'
e_cost = 100
delay = 2 SECONDS // Lasers fire twice every second for 40 dps, this fires every 2 seconds for 15 dps. Seems fair, since every cyborg will have this with more shots?
select_name = "emitter"
code/modules/projectiles/ammunition/magazines.dm
-29
View File
@@ -14,7 +14,6 @@
name = "revolver cylinder"
ammo_type = /obj/item/ammo_casing/a357
caliber = "357"
max_ammo = 7
/obj/item/ammo_box/magazine/internal/cylinder/ammo_count(countempties = 1)
@@ -71,18 +70,14 @@
name = "nagant revolver cylinder"
ammo_type = /obj/item/ammo_casing/n762
caliber = "n762"
max_ammo = 7
/obj/item/ammo_box/magazine/internal/cylinder/cap
name = "cap gun revolver cylinder"
desc = "Oh god, this shouldn't be here!"
ammo_type = /obj/item/ammo_casing/cap
caliber = "cap"
max_ammo = 7
/obj/item/ammo_box/magazine/internal/overgrown
name = "overgrown pistol magazine"
desc = "Oh god, this shouldn't be here!"
ammo_type = /obj/item/ammo_casing/overgrown
max_ammo = 8
@@ -107,14 +102,12 @@
/obj/item/ammo_box/magazine/internal/shot/tube
name = "dual feed shotgun internal tube"
ammo_type = /obj/item/ammo_casing/shotgun/rubbershot
max_ammo = 4
/obj/item/ammo_box/magazine/internal/shot/lethal
ammo_type = /obj/item/ammo_casing/shotgun/buckshot
/obj/item/ammo_box/magazine/internal/shot/com
name = "combat shotgun internal magazine"
ammo_type = /obj/item/ammo_casing/shotgun/beanbag
max_ammo = 6
/obj/item/ammo_box/magazine/internal/shot/malf
@@ -153,7 +146,6 @@
max_ammo = 6
/obj/item/ammo_box/magazine/internal/cylinder/grenadelauncher/multi/fifteen
ammo_type = /obj/item/ammo_casing/a40mm
max_ammo = 15
/obj/item/ammo_box/magazine/internal/speargun
@@ -176,11 +168,9 @@
/obj/item/ammo_box/magazine/internal/boltaction
name = "bolt action rifle internal magazine"
desc = "Oh god, this shouldn't be here!"
ammo_type = /obj/item/ammo_casing/a762
caliber = "a762"
max_ammo = 5
multiload = 1
/obj/item/ammo_box/magazine/internal/boltaction/enchanted
max_ammo =1
@@ -189,7 +179,6 @@
/obj/item/ammo_box/magazine/internal/shot/toy
ammo_type = /obj/item/ammo_casing/caseless/foam_dart
caliber = "foam_force"
max_ammo = 4
/obj/item/ammo_box/magazine/internal/shot/toy/crossbow
max_ammo = 5
@@ -237,7 +226,6 @@
/obj/item/ammo_box/magazine/enforcer
name = "handgun magazine (9mm rubber)"
icon_state = "enforcer"
ammo_type = /obj/item/ammo_casing/rubber9mm
max_ammo = 8
multi_sprite_step = 1
@@ -320,9 +308,6 @@
ammo_type = /obj/item/ammo_casing/c46x30mm/inc
/obj/item/ammo_box/magazine/wt550m9/empty
name = "wt550 magazine (4.6x30mm)"
icon_state = "46x30mmt"
ammo_type = /obj/item/ammo_casing/c46x30mm
/obj/item/ammo_box/magazine/wt550m9/empty/Initialize(mapload)
. = ..()
@@ -373,25 +358,16 @@
name = "stechkin aps magazine (10mm incendiary)"
icon_state = "10mmapsI"
ammo_type = /obj/item/ammo_casing/c10mm/fire
caliber = "10mm"
max_ammo = 20
multi_sprite_step = 5
/obj/item/ammo_box/magazine/apsm10mm/hp
name = "stechkin aps magazine (10mm HP)"
icon_state = "10mmapsH"
ammo_type = /obj/item/ammo_casing/c10mm/hp
caliber = "10mm"
max_ammo = 20
multi_sprite_step = 5
/obj/item/ammo_box/magazine/apsm10mm/ap
name = "stechkin aps magazine (10mm AP)"
icon_state = "10mmapsA"
ammo_type = /obj/item/ammo_casing/c10mm/ap
caliber = "10mm"
max_ammo = 20
multi_sprite_step = 5
/obj/item/ammo_box/magazine/smgm45
name = "\improper SMG magazine (.45)"
@@ -415,7 +391,6 @@
origin_tech = "combat=2"
ammo_type = /obj/item/ammo_casing/a50
caliber = ".50"
max_ammo = 7
multi_sprite_step = 1
/obj/item/ammo_box/magazine/m75
@@ -501,7 +476,6 @@
desc = "An extra large drum magazine."
icon_state = "m12gXlSl"
w_class = WEIGHT_CLASS_NORMAL
ammo_type = /obj/item/ammo_casing/shotgun
max_ammo = 16
/obj/item/ammo_box/magazine/m12g/xtr_lrg/buckshot
@@ -544,7 +518,6 @@
/obj/item/ammo_box/magazine/toy/enforcer
name = "\improper Enforcer foam magazine"
icon_state = "enforcer"
max_ammo = 8
multi_sprite_step = 1
ammo_type = /obj/item/ammo_casing/caseless/foam_dart/riot
@@ -573,7 +546,6 @@
multi_sprite_step = 10
/obj/item/ammo_box/magazine/toy/m762/riot
ammo_type = /obj/item/ammo_casing/caseless/foam_dart/riot
/obj/item/ammo_box/magazine/laser
name = "laser carbine projector magazine"
@@ -604,7 +576,6 @@
multi_sprite_step = 2
/obj/item/ammo_box/magazine/toy/smgm45/riot
ammo_type = /obj/item/ammo_casing/caseless/foam_dart/riot
// yes this doesn't really belong here but nowhere else works
/obj/item/ammo_box/magazine/detective/speedcharger