mirror of
https://github.com/yogstation13/Yogstation.git
synced 2025-02-26 09:04:50 +00:00
Clean up mixed space & tab usage (#40121)
This commit is contained in:
committed by
yogstation13-bot
parent
aa01d58e56
commit
ffefab25f4
@@ -63,8 +63,8 @@
|
|||||||
timeout = 2400
|
timeout = 2400
|
||||||
|
|
||||||
/datum/mood_event/noshoes
|
/datum/mood_event/noshoes
|
||||||
description = "<span class='warning'>I am a disgrace to comedy everywhere!</span>\n"
|
description = "<span class='warning'>I am a disgrace to comedy everywhere!</span>\n"
|
||||||
mood_change = -5
|
mood_change = -5
|
||||||
|
|
||||||
/datum/mood_event/tased
|
/datum/mood_event/tased
|
||||||
description = "<span class='warning'>There's no \"z\" in \"taser\". It's in the zap.</span>\n"
|
description = "<span class='warning'>There's no \"z\" in \"taser\". It's in the zap.</span>\n"
|
||||||
|
|||||||
@@ -499,18 +499,18 @@ NOTE: there are two lists of areas in the end of this file: centcom and station
|
|||||||
icon_state = "Theatre"
|
icon_state = "Theatre"
|
||||||
|
|
||||||
/area/library
|
/area/library
|
||||||
name = "Library"
|
name = "Library"
|
||||||
icon_state = "library"
|
icon_state = "library"
|
||||||
flags_1 = NONE
|
flags_1 = NONE
|
||||||
|
|
||||||
/area/library/lounge
|
/area/library/lounge
|
||||||
name = "Library Lounge"
|
name = "Library Lounge"
|
||||||
icon_state = "library"
|
icon_state = "library"
|
||||||
|
|
||||||
/area/library/abandoned
|
/area/library/abandoned
|
||||||
name = "Abandoned Library"
|
name = "Abandoned Library"
|
||||||
icon_state = "library"
|
icon_state = "library"
|
||||||
flags_1 = NONE
|
flags_1 = NONE
|
||||||
|
|
||||||
/area/chapel
|
/area/chapel
|
||||||
icon_state = "chapel"
|
icon_state = "chapel"
|
||||||
@@ -559,9 +559,9 @@ NOTE: there are two lists of areas in the end of this file: centcom and station
|
|||||||
icon_state = "engine"
|
icon_state = "engine"
|
||||||
|
|
||||||
/area/engine/atmos
|
/area/engine/atmos
|
||||||
name = "Atmospherics"
|
name = "Atmospherics"
|
||||||
icon_state = "atmos"
|
icon_state = "atmos"
|
||||||
flags_1 = NONE
|
flags_1 = NONE
|
||||||
|
|
||||||
/area/engine/atmospherics_engine
|
/area/engine/atmospherics_engine
|
||||||
name = "Atmospherics Engine"
|
name = "Atmospherics Engine"
|
||||||
@@ -1297,7 +1297,7 @@ NOTE: there are two lists of areas in the end of this file: centcom and station
|
|||||||
clockwork_warp_allowed = FALSE
|
clockwork_warp_allowed = FALSE
|
||||||
clockwork_warp_fail = "For safety reasons, warping here is disallowed; the radio and bluespace noise could cause catastrophic results."
|
clockwork_warp_fail = "For safety reasons, warping here is disallowed; the radio and bluespace noise could cause catastrophic results."
|
||||||
ambientsounds = list('sound/ambience/ambisin2.ogg', 'sound/ambience/signal.ogg', 'sound/ambience/signal.ogg', 'sound/ambience/ambigen10.ogg', 'sound/ambience/ambitech.ogg',\
|
ambientsounds = list('sound/ambience/ambisin2.ogg', 'sound/ambience/signal.ogg', 'sound/ambience/signal.ogg', 'sound/ambience/ambigen10.ogg', 'sound/ambience/ambitech.ogg',\
|
||||||
'sound/ambience/ambitech2.ogg', 'sound/ambience/ambitech3.ogg', 'sound/ambience/ambimystery.ogg')
|
'sound/ambience/ambitech2.ogg', 'sound/ambience/ambitech3.ogg', 'sound/ambience/ambimystery.ogg')
|
||||||
|
|
||||||
/area/tcommsat/entrance
|
/area/tcommsat/entrance
|
||||||
name = "Telecomms Teleporter"
|
name = "Telecomms Teleporter"
|
||||||
|
|||||||
@@ -84,7 +84,7 @@
|
|||||||
icon_state = "open"
|
icon_state = "open"
|
||||||
|
|
||||||
/obj/machinery/door/poddoor/try_to_activate_door(mob/user)
|
/obj/machinery/door/poddoor/try_to_activate_door(mob/user)
|
||||||
return
|
return
|
||||||
|
|
||||||
/obj/machinery/door/poddoor/try_to_crowbar(obj/item/I, mob/user)
|
/obj/machinery/door/poddoor/try_to_crowbar(obj/item/I, mob/user)
|
||||||
if(stat & NOPOWER)
|
if(stat & NOPOWER)
|
||||||
|
|||||||
@@ -240,8 +240,8 @@
|
|||||||
GLOB.rcd_list += src
|
GLOB.rcd_list += src
|
||||||
|
|
||||||
/obj/item/mecha_parts/mecha_equipment/rcd/Destroy()
|
/obj/item/mecha_parts/mecha_equipment/rcd/Destroy()
|
||||||
GLOB.rcd_list -= src
|
GLOB.rcd_list -= src
|
||||||
return ..()
|
return ..()
|
||||||
|
|
||||||
/obj/item/mecha_parts/mecha_equipment/rcd/action(atom/target)
|
/obj/item/mecha_parts/mecha_equipment/rcd/action(atom/target)
|
||||||
if(istype(target, /turf/open/space/transit))//>implying these are ever made -Sieve
|
if(istype(target, /turf/open/space/transit))//>implying these are ever made -Sieve
|
||||||
|
|||||||
@@ -562,9 +562,9 @@
|
|||||||
beakers += B2
|
beakers += B2
|
||||||
|
|
||||||
/obj/item/grenade/chem_grenade/tuberculosis
|
/obj/item/grenade/chem_grenade/tuberculosis
|
||||||
name = "Fungal tuberculosis grenade"
|
name = "Fungal tuberculosis grenade"
|
||||||
desc = "WARNING: GRENADE WILL RELEASE DEADLY SPORES CONTAINING ACTIVE AGENTS. SEAL SUIT AND AIRFLOW BEFORE USE."
|
desc = "WARNING: GRENADE WILL RELEASE DEADLY SPORES CONTAINING ACTIVE AGENTS. SEAL SUIT AND AIRFLOW BEFORE USE."
|
||||||
stage = READY
|
stage = READY
|
||||||
|
|
||||||
/obj/item/grenade/chem_grenade/tuberculosis/Initialize()
|
/obj/item/grenade/chem_grenade/tuberculosis/Initialize()
|
||||||
. = ..()
|
. = ..()
|
||||||
|
|||||||
@@ -615,8 +615,8 @@ for further reading, please see: https://github.com/tgstation/tgstation/pull/301
|
|||||||
user.do_attack_animation(M)
|
user.do_attack_animation(M)
|
||||||
playsound(M, 'sound/weapons/slap.ogg', 50, 1, -1)
|
playsound(M, 'sound/weapons/slap.ogg', 50, 1, -1)
|
||||||
user.visible_message("<span class='danger'>[user] slaps [M]!</span>",
|
user.visible_message("<span class='danger'>[user] slaps [M]!</span>",
|
||||||
"<span class='notice'>You slap [M]!</span>",\
|
"<span class='notice'>You slap [M]!</span>",\
|
||||||
"You hear a slap.")
|
"You hear a slap.")
|
||||||
return
|
return
|
||||||
else
|
else
|
||||||
..()
|
..()
|
||||||
|
|||||||
@@ -66,8 +66,8 @@
|
|||||||
addtimer(CALLBACK(src, .proc/sparks), 30)//if bluespace, then 3 seconds after opening, make some sparks and delete
|
addtimer(CALLBACK(src, .proc/sparks), 30)//if bluespace, then 3 seconds after opening, make some sparks and delete
|
||||||
|
|
||||||
/obj/structure/closet/supplypod/proc/sparks()//sparks cant be called from addtimer
|
/obj/structure/closet/supplypod/proc/sparks()//sparks cant be called from addtimer
|
||||||
do_sparks(5, TRUE, src)
|
do_sparks(5, TRUE, src)
|
||||||
qdel(src)//no need for QDEL_IN if we already have a timer
|
qdel(src)//no need for QDEL_IN if we already have a timer
|
||||||
|
|
||||||
/obj/structure/closet/supplypod/Destroy()//make some sparks b4 deletion
|
/obj/structure/closet/supplypod/Destroy()//make some sparks b4 deletion
|
||||||
QDEL_NULL(SupplyOrder)
|
QDEL_NULL(SupplyOrder)
|
||||||
|
|||||||
@@ -97,8 +97,8 @@
|
|||||||
qdel(src)
|
qdel(src)
|
||||||
|
|
||||||
/obj/structure/plasticflaps/Initialize()
|
/obj/structure/plasticflaps/Initialize()
|
||||||
. = ..()
|
. = ..()
|
||||||
air_update_turf(TRUE)
|
air_update_turf(TRUE)
|
||||||
|
|
||||||
/obj/structure/plasticflaps/Destroy()
|
/obj/structure/plasticflaps/Destroy()
|
||||||
var/atom/oldloc = loc
|
var/atom/oldloc = loc
|
||||||
|
|||||||
@@ -294,8 +294,8 @@
|
|||||||
break
|
break
|
||||||
parse_error("Expected ',' or ']' after array assoc value, but found '[token(i)]'")
|
parse_error("Expected ',' or ']' after array assoc value, but found '[token(i)]'")
|
||||||
return i
|
return i
|
||||||
i++
|
i++
|
||||||
continue
|
continue
|
||||||
temp_expression_list = list()
|
temp_expression_list = list()
|
||||||
i = expression(i, temp_expression_list)
|
i = expression(i, temp_expression_list)
|
||||||
while(token(i) && token(i) != "]")
|
while(token(i) && token(i) != "]")
|
||||||
|
|||||||
@@ -228,7 +228,7 @@
|
|||||||
update_visuals()
|
update_visuals()
|
||||||
|
|
||||||
if((!our_excited_group && !(our_air.temperature > MINIMUM_TEMPERATURE_START_SUPERCONDUCTION && consider_superconductivity(starting = TRUE))) \
|
if((!our_excited_group && !(our_air.temperature > MINIMUM_TEMPERATURE_START_SUPERCONDUCTION && consider_superconductivity(starting = TRUE))) \
|
||||||
|| (cached_atmos_cooldown > (EXCITED_GROUP_DISMANTLE_CYCLES * 2)))
|
|| (cached_atmos_cooldown > (EXCITED_GROUP_DISMANTLE_CYCLES * 2)))
|
||||||
SSair.remove_from_active(src)
|
SSair.remove_from_active(src)
|
||||||
|
|
||||||
atmos_cooldown = cached_atmos_cooldown
|
atmos_cooldown = cached_atmos_cooldown
|
||||||
|
|||||||
@@ -13,14 +13,14 @@
|
|||||||
subcategory = CAT_MISCFOOD
|
subcategory = CAT_MISCFOOD
|
||||||
|
|
||||||
/datum/crafting_recipe/food/spiderlollipop
|
/datum/crafting_recipe/food/spiderlollipop
|
||||||
name = "Spider Lollipop"
|
name = "Spider Lollipop"
|
||||||
reqs = list(/obj/item/stack/rods = 1,
|
reqs = list(/obj/item/stack/rods = 1,
|
||||||
/datum/reagent/consumable/sugar = 5,
|
/datum/reagent/consumable/sugar = 5,
|
||||||
/datum/reagent/water = 5,
|
/datum/reagent/water = 5,
|
||||||
/obj/item/reagent_containers/food/snacks/spiderling = 1
|
/obj/item/reagent_containers/food/snacks/spiderling = 1
|
||||||
)
|
)
|
||||||
result = /obj/item/reagent_containers/food/snacks/spiderlollipop
|
result = /obj/item/reagent_containers/food/snacks/spiderlollipop
|
||||||
subcategory = CAT_MISCFOOD
|
subcategory = CAT_MISCFOOD
|
||||||
|
|
||||||
/datum/crafting_recipe/food/chococoin
|
/datum/crafting_recipe/food/chococoin
|
||||||
name = "Choco coin"
|
name = "Choco coin"
|
||||||
|
|||||||
@@ -1085,10 +1085,10 @@
|
|||||||
undeployment_action.Grant(src)
|
undeployment_action.Grant(src)
|
||||||
|
|
||||||
/datum/action/innate/undeployment
|
/datum/action/innate/undeployment
|
||||||
name = "Disconnect from shell"
|
name = "Disconnect from shell"
|
||||||
desc = "Stop controlling your shell and resume normal core operations."
|
desc = "Stop controlling your shell and resume normal core operations."
|
||||||
icon_icon = 'icons/mob/actions/actions_AI.dmi'
|
icon_icon = 'icons/mob/actions/actions_AI.dmi'
|
||||||
button_icon_state = "ai_core"
|
button_icon_state = "ai_core"
|
||||||
|
|
||||||
/datum/action/innate/undeployment/Trigger()
|
/datum/action/innate/undeployment/Trigger()
|
||||||
if(!..())
|
if(!..())
|
||||||
|
|||||||
@@ -1,9 +1,9 @@
|
|||||||
/obj/machinery/modular_computer/console/preset
|
/obj/machinery/modular_computer/console/preset
|
||||||
// Can be changed to give devices specific hardware
|
// Can be changed to give devices specific hardware
|
||||||
var/_has_id_slot = 0
|
var/_has_id_slot = FALSE
|
||||||
var/_has_printer = 0
|
var/_has_printer = FALSE
|
||||||
var/_has_battery = 0
|
var/_has_battery = FALSE
|
||||||
var/_has_ai = 0
|
var/_has_ai = FALSE
|
||||||
|
|
||||||
/obj/machinery/modular_computer/console/preset/Initialize()
|
/obj/machinery/modular_computer/console/preset/Initialize()
|
||||||
. = ..()
|
. = ..()
|
||||||
@@ -29,9 +29,9 @@
|
|||||||
|
|
||||||
// ===== ENGINEERING CONSOLE =====
|
// ===== ENGINEERING CONSOLE =====
|
||||||
/obj/machinery/modular_computer/console/preset/engineering
|
/obj/machinery/modular_computer/console/preset/engineering
|
||||||
console_department = "Engineering"
|
console_department = "Engineering"
|
||||||
name = "engineering console"
|
name = "engineering console"
|
||||||
desc = "A stationary computer. This one comes preloaded with engineering programs."
|
desc = "A stationary computer. This one comes preloaded with engineering programs."
|
||||||
|
|
||||||
/obj/machinery/modular_computer/console/preset/engineering/install_programs()
|
/obj/machinery/modular_computer/console/preset/engineering/install_programs()
|
||||||
var/obj/item/computer_hardware/hard_drive/hard_drive = cpu.all_components[MC_HDD]
|
var/obj/item/computer_hardware/hard_drive/hard_drive = cpu.all_components[MC_HDD]
|
||||||
@@ -41,10 +41,10 @@
|
|||||||
|
|
||||||
// ===== RESEARCH CONSOLE =====
|
// ===== RESEARCH CONSOLE =====
|
||||||
/obj/machinery/modular_computer/console/preset/research
|
/obj/machinery/modular_computer/console/preset/research
|
||||||
console_department = "Research"
|
console_department = "Research"
|
||||||
name = "research director's console"
|
name = "research director's console"
|
||||||
desc = "A stationary computer. This one comes preloaded with research programs."
|
desc = "A stationary computer. This one comes preloaded with research programs."
|
||||||
_has_ai = 1
|
_has_ai = TRUE
|
||||||
|
|
||||||
/obj/machinery/modular_computer/console/preset/research/examine(mob/user)
|
/obj/machinery/modular_computer/console/preset/research/examine(mob/user)
|
||||||
..()
|
..()
|
||||||
@@ -60,11 +60,11 @@
|
|||||||
|
|
||||||
// ===== COMMAND CONSOLE =====
|
// ===== COMMAND CONSOLE =====
|
||||||
/obj/machinery/modular_computer/console/preset/command
|
/obj/machinery/modular_computer/console/preset/command
|
||||||
console_department = "Command"
|
console_department = "Command"
|
||||||
name = "command console"
|
name = "command console"
|
||||||
desc = "A stationary computer. This one comes preloaded with command programs."
|
desc = "A stationary computer. This one comes preloaded with command programs."
|
||||||
_has_id_slot = 1
|
_has_id_slot = TRUE
|
||||||
_has_printer = 1
|
_has_printer = TRUE
|
||||||
|
|
||||||
/obj/machinery/modular_computer/console/preset/command/examine(mob/user)
|
/obj/machinery/modular_computer/console/preset/command/examine(mob/user)
|
||||||
..()
|
..()
|
||||||
@@ -77,9 +77,9 @@
|
|||||||
|
|
||||||
// ===== CIVILIAN CONSOLE =====
|
// ===== CIVILIAN CONSOLE =====
|
||||||
/obj/machinery/modular_computer/console/preset/civilian
|
/obj/machinery/modular_computer/console/preset/civilian
|
||||||
console_department = "Civilian"
|
console_department = "Civilian"
|
||||||
name = "civilian console"
|
name = "civilian console"
|
||||||
desc = "A stationary computer. This one comes preloaded with generic programs."
|
desc = "A stationary computer. This one comes preloaded with generic programs."
|
||||||
|
|
||||||
/obj/machinery/modular_computer/console/preset/civilian/install_programs()
|
/obj/machinery/modular_computer/console/preset/civilian/install_programs()
|
||||||
var/obj/item/computer_hardware/hard_drive/hard_drive = cpu.all_components[MC_HDD]
|
var/obj/item/computer_hardware/hard_drive/hard_drive = cpu.all_components[MC_HDD]
|
||||||
|
|||||||
@@ -92,7 +92,7 @@
|
|||||||
sleep(1)
|
sleep(1)
|
||||||
C.ghostize()
|
C.ghostize()
|
||||||
var/obj/item/bodypart/head/rip_u = C.get_bodypart(BODY_ZONE_HEAD)
|
var/obj/item/bodypart/head/rip_u = C.get_bodypart(BODY_ZONE_HEAD)
|
||||||
rip_u.dismember(BURN) //nice try jedi
|
rip_u.dismember(BURN) //nice try jedi
|
||||||
qdel(rip_u)
|
qdel(rip_u)
|
||||||
|
|
||||||
/obj/singularity/ex_act(severity, target)
|
/obj/singularity/ex_act(severity, target)
|
||||||
|
|||||||
@@ -37,7 +37,7 @@
|
|||||||
repopulate_sorted_areas()
|
repopulate_sorted_areas()
|
||||||
|
|
||||||
for(var/L in block(locate(bounds[MAP_MINX], bounds[MAP_MINY], SSmapping.station_start),
|
for(var/L in block(locate(bounds[MAP_MINX], bounds[MAP_MINY], SSmapping.station_start),
|
||||||
locate(bounds[MAP_MAXX], bounds[MAP_MAXY], z_offset - 1)))
|
locate(bounds[MAP_MAXX], bounds[MAP_MAXY], z_offset - 1)))
|
||||||
set waitfor = FALSE
|
set waitfor = FALSE
|
||||||
var/turf/B = L
|
var/turf/B = L
|
||||||
atoms += B
|
atoms += B
|
||||||
|
|||||||
@@ -8,13 +8,13 @@
|
|||||||
throw_speed = 3
|
throw_speed = 3
|
||||||
|
|
||||||
/obj/item/ammo_casing/caseless/laser
|
/obj/item/ammo_casing/caseless/laser
|
||||||
name = "laser casing"
|
name = "laser casing"
|
||||||
desc = "You shouldn't be seeing this."
|
desc = "You shouldn't be seeing this."
|
||||||
caliber = "laser"
|
caliber = "laser"
|
||||||
icon_state = "s-casing-live"
|
icon_state = "s-casing-live"
|
||||||
projectile_type = /obj/item/projectile/beam
|
projectile_type = /obj/item/projectile/beam
|
||||||
fire_sound = 'sound/weapons/laser.ogg'
|
fire_sound = 'sound/weapons/laser.ogg'
|
||||||
firing_effect_type = /obj/effect/temp_visual/dir_setting/firing_effect/energy
|
firing_effect_type = /obj/effect/temp_visual/dir_setting/firing_effect/energy
|
||||||
|
|
||||||
/obj/item/ammo_casing/caseless/laser/gatling
|
/obj/item/ammo_casing/caseless/laser/gatling
|
||||||
projectile_type = /obj/item/projectile/beam/weak
|
projectile_type = /obj/item/projectile/beam/weak
|
||||||
|
|||||||
@@ -1,14 +1,14 @@
|
|||||||
/obj/item/ammo_box/magazine/recharge
|
/obj/item/ammo_box/magazine/recharge
|
||||||
name = "power pack"
|
name = "power pack"
|
||||||
desc = "A rechargeable, detachable battery that serves as a magazine for laser rifles."
|
desc = "A rechargeable, detachable battery that serves as a magazine for laser rifles."
|
||||||
icon_state = "oldrifle-20"
|
icon_state = "oldrifle-20"
|
||||||
ammo_type = /obj/item/ammo_casing/caseless/laser
|
ammo_type = /obj/item/ammo_casing/caseless/laser
|
||||||
caliber = "laser"
|
caliber = "laser"
|
||||||
max_ammo = 20
|
max_ammo = 20
|
||||||
|
|
||||||
/obj/item/ammo_box/magazine/recharge/update_icon()
|
/obj/item/ammo_box/magazine/recharge/update_icon()
|
||||||
desc = "[initial(desc)] It has [stored_ammo.len] shot\s left."
|
desc = "[initial(desc)] It has [stored_ammo.len] shot\s left."
|
||||||
icon_state = "oldrifle-[round(ammo_count(),4)]"
|
icon_state = "oldrifle-[round(ammo_count(),4)]"
|
||||||
|
|
||||||
/obj/item/ammo_box/magazine/recharge/attack_self() //No popping out the "bullets"
|
/obj/item/ammo_box/magazine/recharge/attack_self() //No popping out the "bullets"
|
||||||
return
|
return
|
||||||
|
|||||||
Reference in New Issue
Block a user