cyberpresidentvanellope/Bubberstation
1
0
Fork 0
mirror of https://github.com/Bubberstation/Bubberstation.git synced 2026-08-23 21:18:37 +01:00
Code Issues Packages Projects Releases Wiki Activity

Compiling fixes

Browse Source
This commit is contained in:
xPokee
2025-09-24 10:55:43 -04:00
parent bae95b4cc8
commit 7527fbbeef
9 changed files with 27 additions and 30 deletions
Download Patch File Download Diff File Expand all files Collapse all files
modular_skyrat/modules/assault_operatives/code/turrets.dm
+1 -1
View File
@@ -10,7 +10,7 @@
//Exterior ship turrets
/obj/machinery/porta_turret/syndicate/assaultops/shuttle
scan_range = 9
lethal_projectile = /obj/projectile/bullet/a357
lethal_projectile = /obj/projectile/bullet/c357
lethal_projectile_sound = 'modular_skyrat/modules/aesthetics/guns/sound/sniperrifle.ogg'
stun_projectile = /obj/projectile/energy/electrode
stun_projectile_sound = 'sound/items/weapons/taser.ogg'
modular_skyrat/modules/borgs/code/robot_model.dm
-2
View File
@@ -364,7 +364,6 @@
name = "Syndicate"
basic_modules = list(
/obj/item/assembly/flash/cyborg,
/obj/item/borg/sight/thermal,
/obj/item/extinguisher,
/obj/item/weldingtool/electric,
/obj/item/borg/cyborg_omnitool/engineering,
@@ -505,7 +504,6 @@
name = "Spider Clan Saboteur"
basic_modules = list(
/obj/item/assembly/flash/cyborg,
/obj/item/borg/sight/thermal,
/obj/item/katana/ninja_blade,
/obj/item/construction/rcd/borg/syndicate,
/obj/item/pipe_dispenser,
modular_skyrat/modules/company_imports/code/armament_datums/vitezstvi_ammo.dm
+3 -3
View File
@@ -46,13 +46,13 @@
cost = PAYCHECK_CREW * 2
/datum/armament_entry/company_import/vitezstvi/speedloader/detective_lethal
item_type = /obj/item/ammo_box/c38
item_type = /obj/item/ammo_box/speedloader/c38
/datum/armament_entry/company_import/vitezstvi/speedloader/detective_dumdum
item_type = /obj/item/ammo_box/c38/dumdum
item_type = /obj/item/ammo_box/speedloader/c38/dumdum
/datum/armament_entry/company_import/vitezstvi/speedloader/detective_bouncy
item_type = /obj/item/ammo_box/c38/match
item_type = /obj/item/ammo_box/speedloader/c38/match
// Shotgun boxes
modular_skyrat/modules/moretraitoritems/code/weapons.dm
+7 -7
View File
@@ -8,13 +8,13 @@
icon_state = "c38_panther"
accepted_magazine_type = /obj/item/ammo_box/magazine/internal/cylinder
/obj/item/ammo_casing/a357/peacemaker
/obj/item/ammo_casing/c357/peacemaker
name = ".357 Peacemaker bullet casing"
desc = "A .357 Peacemaker bullet casing."
caliber = CALIBER_357
projectile_type = /obj/projectile/bullet/a357/peacemaker
projectile_type = /obj/projectile/bullet/c357/peacemaker
/obj/projectile/bullet/a357/peacemaker
/obj/projectile/bullet/c357/peacemaker
name = ".357 Peacemaker bullet"
damage = 25
wound_bonus = 0
@@ -25,24 +25,24 @@
ricochet_incidence_leeway = 80
ricochet_decay_chance = 1
/datum/design/a357/peacemaker
/datum/design/c357/peacemaker
name = "Speed Loader (.357 Peacemaker)"
id = "a357PM"
build_type = AUTOLATHE
materials = list(
/datum/material/iron = SHEET_MATERIAL_AMOUNT * 2,
)
build_path = /obj/item/ammo_box/a357/peacemaker
build_path = /obj/item/ammo_box/speedloader/c357/peacemaker
category = list(
RND_CATEGORY_HACKED,
RND_CATEGORY_WEAPONS + RND_SUBCATEGORY_WEAPONS_AMMO,
)
/obj/item/ammo_box/a357/peacemaker
/obj/item/ammo_box/speedloader/c357/peacemaker
name = "speed loader (.357 Peacemaker)"
desc = "Designed to quickly reload revolvers."
icon_state = "357"
ammo_type = /obj/item/ammo_casing/a357/peacemaker
ammo_type = /obj/item/ammo_casing/c357/peacemaker
max_ammo = 7
multiple_sprites = AMMO_BOX_PER_BULLET
item_flags = NO_MAT_REDEMPTION
modular_skyrat/modules/opposing_force/code/equipment/ammo.dm
+6 -6
View File
@@ -17,18 +17,18 @@
description = "A box of slug shotgun shells, fires only one big fuck-off bullet that wounds extra hard."
item_type = /obj/item/ammo_box/advanced/s12gauge
/datum/opposing_force_equipment/ammo_exotic/a357phasic
/datum/opposing_force_equipment/ammo_exotic/c357phasic
description = "A speedloader of .357 that ignores structure collision at the cost of some damage."
admin_note = "Bullets ignore walls, has a damage penalty."
item_type = /obj/item/ammo_box/a357/phasic
item_type = /obj/item/ammo_box/speedloader/c357/phasic
/datum/opposing_force_equipment/ammo_exotic/a357heartseeker
/datum/opposing_force_equipment/ammo_exotic/c357heartseeker
description = "A speedloader of .357 with homing capabilities."
item_type = /obj/item/ammo_box/a357/heartseeker
item_type = /obj/item/ammo_box/speedloader/c357/heartseeker
/datum/opposing_force_equipment/ammo_exotic/a357peacemaker
/datum/opposing_force_equipment/ammo_exotic/c357peacemaker
description = "A speedloader of .357 that have their impact lessened to highten the odds for ricochet shots."
item_type = /obj/item/ammo_box/a357/peacemaker
item_type = /obj/item/ammo_box/speedloader/c357/peacemaker
/datum/opposing_force_equipment/ammo_exotic/ap45
description = "An smg magazine of armour piercing .45, used by the c20-r."
modular_skyrat/modules/opposing_force/code/equipment/guns.dm
+4 -4
View File
@@ -124,8 +124,8 @@
/obj/item/storage/toolbox/guncase/skyrat/pistol/opfor/syndie_revolver/PopulateContents()
new /obj/item/gun/ballistic/revolver(src)
new /obj/item/ammo_box/a357(src)
new /obj/item/ammo_box/a357(src)
new /obj/item/ammo_box/speedloader/c357(src)
new /obj/item/ammo_box/speedloader/c357(src)
/datum/opposing_force_equipment/ranged_stealth/ocelot
name = "Colt Peacemaker revolver"
@@ -135,8 +135,8 @@
/obj/item/storage/toolbox/guncase/skyrat/pistol/opfor/ocelot/PopulateContents()
new /obj/item/gun/ballistic/revolver/ocelot(src)
new /obj/item/ammo_box/a357/peacemaker(src)
new /obj/item/ammo_box/a357/peacemaker(src)
new /obj/item/ammo_box/speedloader/c357/peacemaker(src)
new /obj/item/ammo_box/speedloader/c357/peacemaker(src)
//foamforce
/datum/opposing_force_equipment/ranged_stealth/foamforce_smg
modular_skyrat/modules/sec_haul/code/guns/cargo_stuff.dm
+3 -3
View File
@@ -19,9 +19,9 @@
/datum/supply_pack/security/ammo
contains = list(/obj/item/ammo_box/advanced/s12gauge/bean = 3,
/obj/item/ammo_box/advanced/s12gauge/rubber = 3,
/obj/item/ammo_box/c38/trac,
/obj/item/ammo_box/c38/hotshot,
/obj/item/ammo_box/c38/iceblox,
/obj/item/ammo_box/speedloader/c38/trac,
/obj/item/ammo_box/speedloader/c38/hotshot,
/obj/item/ammo_box/speedloader/c38/iceblox,
)
special = FALSE
modular_zubbers/code/modules/cargo/packs/security.dm
+3 -3
View File
@@ -15,9 +15,9 @@
/datum/supply_pack/security/ammo
contains = list(/obj/item/ammo_box/advanced/s12gauge/bean = 3,
/obj/item/ammo_box/advanced/s12gauge/rubber = 3,
/obj/item/ammo_box/c38/trac,
/obj/item/ammo_box/c38/hotshot,
/obj/item/ammo_box/c38/iceblox,
/obj/item/ammo_box/speedloader/c38/trac,
/obj/item/ammo_box/speedloader/c38/hotshot,
/obj/item/ammo_box/speedloader/c38/iceblox,
)
special = FALSE
//This makes the Security ammo crate use the cool advanced ammo boxes instead of the old ones
modular_zubbers/maps/offstation/persistence/mob_spawns.dm
-1
View File
@@ -191,7 +191,6 @@
/obj/item/borg/lollipop,
/obj/item/borg/apparatus/beaker,
/obj/item/restraints/handcuffs/cable/zipties,
/obj/item/borg/sight/meson,
/obj/item/borg_shapeshifter/dauntless
)