cyberpresidentvanellope/Aurora.3
1
0
Fork 0
mirror of https://github.com/Aurorastation/Aurora.3.git synced 2026-08-24 05:23:22 +01:00
Code Issues Packages Projects Releases Wiki Activity

Travis: Indentation / list fixes (#1254)

Browse Source 
Fixes the tools/indentation.awk script to not demand a comma at the end of perfectly valid comments.
Makes it report unnecessary commas in lists.
Readds it to the Travis build list.
This commit is contained in:
SoundScopes
2016-12-19 16:40:52 +02:00
committed by skull132
parent 7267ec826c
commit 97bb1e8e38
91 changed files with 483 additions and 440 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/game/objects/items.dm
+1 -1
View File
@@ -264,7 +264,7 @@ var/list/global/slot_flags_enumeration = list(
"[slot_r_ear]" = SLOT_EARS|SLOT_TWOEARS,
"[slot_w_uniform]" = SLOT_ICLOTHING,
"[slot_wear_id]" = SLOT_ID,
"[slot_tie]" = SLOT_TIE,
"[slot_tie]" = SLOT_TIE
)
//the mob M is attempting to equip this item into the slot passed through as 'slot'. Return 1 if it can do this and 0 if it can't.
code/game/objects/items/toys.dm
+2 -2
View File
@@ -144,7 +144,7 @@
item_state = "revolver"
item_icons = list(//ITEM_ICONS ARE DEPRECATED. USE CONTAINED SPRITES IN FUTURE
icon_l_hand = 'icons/mob/items/lefthand_guns.dmi',
icon_r_hand = 'icons/mob/items/righthand_guns.dmi',
icon_r_hand = 'icons/mob/items/righthand_guns.dmi'
)
flags = CONDUCT
slot_flags = SLOT_BELT|SLOT_HOLSTER
@@ -226,7 +226,7 @@
item_state = "crossbow"
item_icons = list(//ITEM_ICONS ARE DEPRECATED. USE CONTAINED SPRITES IN FUTURE
icon_l_hand = 'icons/mob/items/lefthand_guns.dmi',
icon_r_hand = 'icons/mob/items/righthand_guns.dmi',
icon_r_hand = 'icons/mob/items/righthand_guns.dmi'
)
w_class = 2.0
attack_verb = list("attacked", "struck", "hit")
code/game/objects/items/weapons/circuitboards/machinery/commsantenna.dm
+2 -2
View File
@@ -11,5 +11,5 @@
"/obj/item/stack/cable_coil" = 30,
"/obj/item/weapon/stock_parts/manipulator" = 2,
"/obj/item/weapon/stock_parts/subspace/filter" = 1,
"/obj/item/weapon/stock_parts/subspace/crystal" = 1,
)
"/obj/item/weapon/stock_parts/subspace/crystal" = 1
)
code/game/objects/items/weapons/storage/backpack.dm
+7 -7
View File
@@ -8,14 +8,14 @@
desc = "You wear this on your back and put items into it."
item_icons = list(//ITEM_ICONS ARE DEPRECATED. USE CONTAINED SPRITES IN FUTURE
slot_l_hand_str = 'icons/mob/items/lefthand_backpacks.dmi',
slot_r_hand_str = 'icons/mob/items/righthand_backpacks.dmi',
slot_r_hand_str = 'icons/mob/items/righthand_backpacks.dmi'
)
icon_state = "backpack"
item_state = null
//most backpacks use the default backpack state for inhand overlays
item_state_slots = list(
slot_l_hand_str = "backpack",
slot_r_hand_str = "backpack",
slot_r_hand_str = "backpack"
)
sprite_sheets = list(
"Resomi" = 'icons/mob/species/resomi/back.dmi'
@@ -195,7 +195,7 @@
icon_state = "satchel-eng"
item_state_slots = list(
slot_l_hand_str = "engiepack",
slot_r_hand_str = "engiepack",
slot_r_hand_str = "engiepack"
)
/obj/item/weapon/storage/backpack/satchel_med
@@ -204,7 +204,7 @@
icon_state = "satchel-med"
item_state_slots = list(
slot_l_hand_str = "medicalpack",
slot_r_hand_str = "medicalpack",
slot_r_hand_str = "medicalpack"
)
/obj/item/weapon/storage/backpack/satchel_vir
@@ -233,7 +233,7 @@
icon_state = "satchel-sec"
item_state_slots = list(
slot_l_hand_str = "securitypack",
slot_r_hand_str = "securitypack",
slot_r_hand_str = "securitypack"
)
/obj/item/weapon/storage/backpack/satchel_hyd
@@ -247,7 +247,7 @@
icon_state = "satchel-cap"
item_state_slots = list(
slot_l_hand_str = "satchel-cap",
slot_r_hand_str = "satchel-cap",
slot_r_hand_str = "satchel-cap"
)
/obj/item/weapon/storage/backpack/satchel_syndie
@@ -267,7 +267,7 @@
icon_state = "ert_commander"
item_state_slots = list(
slot_l_hand_str = "securitypack",
slot_r_hand_str = "securitypack",
slot_r_hand_str = "securitypack"
)
//Commander
code/game/objects/items/weapons/storage/boxes.dm
+1 -1
View File
@@ -793,7 +793,7 @@
/obj/item/weapon/reagent_containers/food/snacks/tastybread,
/obj/item/weapon/reagent_containers/food/snacks/meatsnack,
/obj/item/weapon/reagent_containers/food/snacks/maps,
/obj/item/weapon/reagent_containers/food/snacks/nathisnack,
/obj/item/weapon/reagent_containers/food/snacks/nathisnack
)
for (var/i = 0,i<7,i++)
var/type = pick(snacks)
code/game/objects/items/weapons/tanks/tanks.dm
+1 -1
View File
@@ -274,7 +274,7 @@ var/list/global/tank_gauge_cache = list()
round(min(BOMBCAP_DVSTN_RADIUS, range*0.25)),
round(min(BOMBCAP_HEAVY_RADIUS, range*0.50)),
round(min(BOMBCAP_LIGHT_RADIUS, range*1.00)),
round(min(BOMBCAP_FLASH_RADIUS, range*1.50)),
round(min(BOMBCAP_FLASH_RADIUS, range*1.50))
)
qdel(src)
code/game/objects/items/weapons/traps.dm
+1 -1
View File
@@ -40,7 +40,7 @@
if(buckled_mob && can_use(user))
user.visible_message(
"<span class='notice'>[user] begins freeing [buckled_mob] from \the [src].</span>",
"<span class='notice'>You carefully begin to free [buckled_mob] from \the [src].</span>",
"<span class='notice'>You carefully begin to free [buckled_mob] from \the [src].</span>"
)
if(do_after(user, 60))
user.visible_message("<span class='notice'>[buckled_mob] has been freed from \the [src] by [user].</span>")
code/game/objects/random/random.dm
+1 -1
View File
@@ -514,7 +514,7 @@
"/obj/item/weapon/coin/phoron" = 0.5,
"/obj/item/weapon/coin/uranium" = 0.5,
"/obj/item/weapon/coin/platinum" = 0.2,
"/obj/item/weapon/coin/diamond" = 0.1,
"/obj/item/weapon/coin/diamond" = 0.1
)
return pickweight(coin)