cyberpresidentvanellope/Bubberstation
1
0
Fork 0
mirror of https://github.com/Bubberstation/Bubberstation.git synced 2025-12-10 17:52:36 +00:00
Code Issues Packages Projects Releases Wiki Activity

[MIRROR] removes double spaces AFTER symbols [MDB IGNORE] (#9226)

Browse Source 
* removes double spaces AFTER symbols

* Fixing conflicts

Co-authored-by: John Willard <53777086+JohnFulpWillard@users.noreply.github.com>
Co-authored-by: GoldenAlpharex <jerego1234@hotmail.com>
This commit is contained in:
SkyratBot
2021-11-05 22:15:12 +00:00
committed by GitHub
parent 2a61065e2b
commit b7b6bd501f
166 changed files with 252 additions and 252 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
code/modules/projectiles/gun.dm
View File

@@ -9,7 +9,7 @@
icon_state = "detective"
inhand_icon_state = "gun"
worn_icon_state = "gun"
flags_1 = CONDUCT_1
flags_1 = CONDUCT_1
slot_flags = ITEM_SLOT_BELT
custom_materials = list(/datum/material/iron=2000)
w_class = WEIGHT_CLASS_NORMAL

2
code/modules/projectiles/guns/ballistic/shotgun.dm
View File

@@ -15,7 +15,7 @@
load_sound = 'sound/weapons/gun/shotgun/insert_shell.ogg'
w_class = WEIGHT_CLASS_BULKY
force = 10
flags_1 = CONDUCT_1
flags_1 = CONDUCT_1
slot_flags = ITEM_SLOT_BACK
mag_type = /obj/item/ammo_box/magazine/internal/shot
semi_auto = FALSE

2
code/modules/projectiles/guns/energy/laser.dm
View File

@@ -95,7 +95,7 @@
worn_icon_state = null
w_class = WEIGHT_CLASS_BULKY
force = 10
flags_1 = CONDUCT_1
flags_1 = CONDUCT_1
slot_flags = ITEM_SLOT_BACK
ammo_type = list(/obj/item/ammo_casing/energy/laser/accelerator)
pin = null

2
code/modules/projectiles/guns/energy/pulse.dm
View File

@@ -7,7 +7,7 @@
w_class = WEIGHT_CLASS_BULKY
force = 10
modifystate = TRUE
flags_1 = CONDUCT_1
flags_1 = CONDUCT_1
slot_flags = ITEM_SLOT_BACK
ammo_type = list(/obj/item/ammo_casing/energy/laser/pulse, /obj/item/ammo_casing/energy/electrode, /obj/item/ammo_casing/energy/laser)
cell_type = "/obj/item/stock_parts/cell/pulse"

2
code/modules/projectiles/guns/energy/special.dm
View File

@@ -7,7 +7,7 @@
shaded_charge = TRUE
can_flashlight = TRUE
w_class = WEIGHT_CLASS_HUGE
flags_1 = CONDUCT_1
flags_1 = CONDUCT_1
slot_flags = ITEM_SLOT_BACK
ammo_type = list(/obj/item/ammo_casing/energy/ion)
flight_x_offset = 17

2
code/modules/projectiles/guns/magic.dm
View File

@@ -7,7 +7,7 @@
lefthand_file = 'icons/mob/inhands/items_lefthand.dmi' //not really a gun and some toys use these inhands
righthand_file = 'icons/mob/inhands/items_righthand.dmi'
fire_sound = 'sound/weapons/emitter.ogg'
flags_1 = CONDUCT_1
flags_1 = CONDUCT_1
w_class = WEIGHT_CLASS_HUGE
///what kind of magic is this
var/school = SCHOOL_EVOCATION