mirror of
https://github.com/Aurorastation/Aurora.3.git
synced 2026-07-13 00:47:31 +01:00
Fix indentations (#17481)
* cbt * AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA * fsadffsda sad * sadfasd * jhn * dsfa * saf * safsad * sda
This commit is contained in:
@@ -12,8 +12,10 @@
|
||||
var/destroyed_stack_amount //to specify a non-zero amount of stack to drop when destroyed
|
||||
var/health = 100 //Pretty tough. Changes sprites at 300 and 150
|
||||
var/maxhealth = 100 //Basic code functions
|
||||
/// Used for calculating some stuff related to maxhealth as it constantly changes due to e.g. barbed wire. set to 100 to avoid possible divisions by zero
|
||||
|
||||
///Used for calculating some stuff related to maxhealth as it constantly changes due to e.g. barbed wire. set to 100 to avoid possible divisions by zero
|
||||
var/starting_maxhealth = 100
|
||||
|
||||
var/force_level_absorption = 5 //How much force an item needs to even damage it at all.
|
||||
var/barricade_hitsound
|
||||
var/barricade_type = "barricade" //"metal", "plasteel", etc.
|
||||
|
||||
@@ -27,23 +27,23 @@
|
||||
return sign_choices
|
||||
|
||||
/obj/structure/sign/double/barsign/proc/set_sign()
|
||||
var/list/sign_choices = get_sign_choices()
|
||||
var/list/sign_choices = get_sign_choices()
|
||||
|
||||
var/list/sign_index = list()
|
||||
for(var/sign in sign_choices)
|
||||
var/singleton/sign/double/B = GET_SINGLETON(sign)
|
||||
sign_index["[B.name]"] = B
|
||||
var/list/sign_index = list()
|
||||
for(var/sign in sign_choices)
|
||||
var/singleton/sign/double/B = GET_SINGLETON(sign)
|
||||
sign_index["[B.name]"] = B
|
||||
|
||||
var/sign_choice = input("What should the sign be changed to?") as null|anything in sign_index
|
||||
if(!sign_choice)
|
||||
return
|
||||
var/singleton/sign/double/signselect = sign_index[sign_choice]
|
||||
var/sign_choice = input("What should the sign be changed to?") as null|anything in sign_index
|
||||
if(!sign_choice)
|
||||
return
|
||||
var/singleton/sign/double/signselect = sign_index[sign_choice]
|
||||
|
||||
name = signselect.name
|
||||
desc = signselect.desc
|
||||
desc_extended = signselect.desc_extended
|
||||
icon_state = signselect.icon_state
|
||||
update_icon()
|
||||
name = signselect.name
|
||||
desc = signselect.desc
|
||||
desc_extended = signselect.desc_extended
|
||||
icon_state = signselect.icon_state
|
||||
update_icon()
|
||||
|
||||
/obj/structure/sign/double/barsign/kitchensign
|
||||
icon = 'icons/obj/kitchensigns.dmi'
|
||||
@@ -160,4 +160,4 @@
|
||||
name = "City Alive"
|
||||
icon_state = "City Alive"
|
||||
desc = "City Alive is another popular restaurant chain, originating from Eridani I. It is famous for its light shows."
|
||||
desc_extended = "City Alive is a high class restaurant chain, dotted all over Eridani I and III. Especially on Eridani I they are also famous for their light shows in the evenings. These lights look like pulsating veins, making the city seem alive, especially when observed from orbit."
|
||||
desc_extended = "City Alive is a high class restaurant chain, dotted all over Eridani I and III. Especially on Eridani I they are also famous for their light shows in the evenings. These lights look like pulsating veins, making the city seem alive, especially when observed from orbit."
|
||||
|
||||
@@ -23,7 +23,7 @@
|
||||
if(hat)
|
||||
remove_hat(user)
|
||||
add_fingerprint(user)
|
||||
return
|
||||
return
|
||||
|
||||
/obj/structure/coatrack/proc/remove_coat(mob/user as mob)
|
||||
user.visible_message("[user] takes [coat] off \the [src].", SPAN_NOTICE("You take [coat] off the \the [src]."))
|
||||
@@ -118,12 +118,12 @@
|
||||
coat_icon_file = T.icon
|
||||
|
||||
var/icon/coat_icon = new(coat_icon_file, coat_icon_state)
|
||||
|
||||
|
||||
coat_icon.Blend(coat_outline, ICON_OVERLAY)
|
||||
coat_icon.SwapColor(rgb(255, 0, 220, 255), rgb(0, 0, 0, 0)) //Slice the coat in half.
|
||||
var/image/coat_image = image(coat_icon)
|
||||
if(T.color)
|
||||
coat_image.color = T.color
|
||||
coat_image.color = T.color
|
||||
|
||||
if(T.build_from_parts)
|
||||
var/icon/overlay_icon = new(coat_icon_file, "[coat_icon_state]_[T.worn_overlay]")
|
||||
@@ -135,4 +135,4 @@
|
||||
|
||||
M.Translate(-1, 5) // Stick it on the coat rack.
|
||||
coat_image.transform = M
|
||||
add_overlay(coat_image)
|
||||
add_overlay(coat_image)
|
||||
|
||||
@@ -29,7 +29,7 @@
|
||||
|
||||
var/storage_capacity = 45 //Tying this to mob sizes was dumb
|
||||
//This is so that someone can't pack hundreds of items in a locker/crate
|
||||
//then open it in a populated area to crash clients.
|
||||
//then open it in a populated area to crash clients.
|
||||
|
||||
var/open_sound = 'sound/effects/closet_open.ogg'
|
||||
var/close_sound = 'sound/effects/closet_close.ogg'
|
||||
|
||||
@@ -59,4 +59,4 @@
|
||||
new /obj/item/clothing/head/hazmat/custodial(src)
|
||||
new /obj/item/clothing/suit/hazmat/custodial(src)
|
||||
new /obj/item/clothing/mask/gas/half(src)
|
||||
new /obj/item/watertank/janitor(src)
|
||||
new /obj/item/watertank/janitor(src)
|
||||
|
||||
@@ -44,7 +44,7 @@
|
||||
add_fingerprint(user)
|
||||
locked = !locked
|
||||
user.visible_message(SPAN_NOTICE("[user] [locked ? null : "un"]locks \the [src]."),
|
||||
SPAN_NOTICE("You [locked ? null : "un"]lock \the [src]."))
|
||||
SPAN_NOTICE("You [locked ? null : "un"]lock \the [src]."))
|
||||
update_icon()
|
||||
else if(!silent)
|
||||
to_chat(user, SPAN_NOTICE("Access Denied."))
|
||||
|
||||
@@ -55,4 +55,4 @@
|
||||
new /obj/item/clothing/suit/caution(src)
|
||||
new /obj/item/clothing/suit/caution(src)
|
||||
new /obj/item/storage/box/lights/mixed(src)
|
||||
new /obj/item/storage/box/mousetraps(src)
|
||||
new /obj/item/storage/box/mousetraps(src)
|
||||
|
||||
@@ -78,9 +78,9 @@
|
||||
appearance_flags |= KEEP_TOGETHER
|
||||
dir = L.dir
|
||||
color = list(
|
||||
0.30, 0.3, 0.25,
|
||||
0.30, 0.3, 0.25,
|
||||
0.30, 0.3, 0.25
|
||||
0.30, 0.3, 0.25,
|
||||
0.30, 0.3, 0.25,
|
||||
0.30, 0.3, 0.25
|
||||
)
|
||||
name = "statue of [L.name]"
|
||||
desc = "An incredibly lifelike stone carving."
|
||||
|
||||
@@ -15,8 +15,8 @@
|
||||
for(var/atom/movable/AM in contents)
|
||||
if(AM.simulated) AM.forceMove(T)
|
||||
user.visible_message(SPAN_NOTICE("[user] pries \the [src] open."), \
|
||||
SPAN_NOTICE("You pry open \the [src]."), \
|
||||
SPAN_NOTICE("You hear splitting wood."))
|
||||
SPAN_NOTICE("You pry open \the [src]."), \
|
||||
SPAN_NOTICE("You hear splitting wood."))
|
||||
for(var/obj/vehicle/V in T.contents)
|
||||
if(V)
|
||||
V.unload(user)
|
||||
|
||||
@@ -2432,4 +2432,4 @@
|
||||
icon_state = "raskara"
|
||||
flag_path = "raskara"
|
||||
flag_item = /obj/item/flag/raskara
|
||||
stand_icon = "wood_stand"
|
||||
stand_icon = "wood_stand"
|
||||
|
||||
@@ -26,4 +26,4 @@
|
||||
L.bodytemperature += steam_temperature
|
||||
if(steam_temperature >= 100)
|
||||
L.apply_damage(50, DAMAGE_BURN)
|
||||
to_chat(L, SPAN_WARNING("Your skin fizzes as the steam touches it!"))
|
||||
to_chat(L, SPAN_WARNING("Your skin fizzes as the steam touches it!"))
|
||||
|
||||
@@ -138,4 +138,4 @@
|
||||
health -= 5
|
||||
healthcheck()
|
||||
|
||||
#undef NODERANGE
|
||||
#undef NODERANGE
|
||||
|
||||
@@ -72,4 +72,4 @@
|
||||
visible_message(SPAN_WARNING("\The [Proj] bounces off \the [src]!"))
|
||||
return
|
||||
visible_message(SPAN_WARNING("\The [Proj] hits \the [src]!"))
|
||||
do_integrity_check(Proj.damage)
|
||||
do_integrity_check(Proj.damage)
|
||||
|
||||
@@ -5,4 +5,4 @@
|
||||
icon_state = "rredouane"
|
||||
density = TRUE
|
||||
anchored = TRUE
|
||||
layer = ABOVE_ALL_MOB_LAYER
|
||||
layer = ABOVE_ALL_MOB_LAYER
|
||||
|
||||
@@ -240,7 +240,7 @@
|
||||
icon = 'icons/obj/spaceship/cockpit_chair.dmi'
|
||||
|
||||
/obj/structure/bed/stool/chair/cockpit/CanPass(atom/movable/mover, turf/target, height, air_group)
|
||||
return TRUE
|
||||
return TRUE
|
||||
|
||||
/obj/structure/bed/stool/chair/cockpit/update_icon()
|
||||
..()
|
||||
|
||||
@@ -12,7 +12,7 @@
|
||||
|
||||
var/bloodiness
|
||||
|
||||
/obj/structure/bed/stool/chair/office/wheelchair/New(var/newloc) // Colorable wheelchairs?
|
||||
/obj/structure/bed/stool/chair/office/wheelchair/New(var/newloc) // Colorable wheelchairs?
|
||||
..(newloc, MATERIAL_STEEL, MATERIAL_CLOTH)
|
||||
|
||||
/obj/structure/bed/stool/chair/office/wheelchair/set_dir()
|
||||
|
||||
@@ -44,7 +44,7 @@
|
||||
var/dat = "<br>"
|
||||
dat += "Oxygen tanks: [oxygentanks] - [oxygentanks ? "<A href='?src=\ref[src];oxygen=1'>Dispense</A>" : "empty"]<br>"
|
||||
dat += "Phoron tanks: [phorontanks] - [phorontanks ? "<A href='?src=\ref[src];phoron=1'>Dispense</A>" : "empty"]"
|
||||
|
||||
|
||||
var/datum/browser/dispenser_win = new(user, "dispenser", capitalize_first_letters(name), 300, 250)
|
||||
dispenser_win.set_content(dat)
|
||||
dispenser_win.open()
|
||||
@@ -115,4 +115,4 @@
|
||||
add_fingerprint(usr)
|
||||
updateUsrDialog()
|
||||
else
|
||||
usr << browse(null, "window=dispenser")
|
||||
usr << browse(null, "window=dispenser")
|
||||
|
||||
@@ -59,4 +59,4 @@
|
||||
|
||||
/obj/structure/target_stake/Destroy()
|
||||
set_target(null)
|
||||
return ..()
|
||||
return ..()
|
||||
|
||||
@@ -59,4 +59,4 @@
|
||||
if(has_tranq)
|
||||
icon_state = "tranq_full"
|
||||
else
|
||||
icon_state = "tranq_empty"
|
||||
icon_state = "tranq_empty"
|
||||
|
||||
@@ -6,4 +6,4 @@
|
||||
..()
|
||||
if(ishuman(user))
|
||||
var/mob/living/carbon/human/H = user
|
||||
SSvirtualreality.create_virtual_reality_avatar(H)
|
||||
SSvirtualreality.create_virtual_reality_avatar(H)
|
||||
|
||||
@@ -9,4 +9,4 @@
|
||||
light_range = 3
|
||||
|
||||
/obj/structure/warp_drive/attack_hand(var/mob/user)
|
||||
do_teleport(user, get_turf(user), 8, asoundin = 'sound/effects/phasein.ogg')
|
||||
do_teleport(user, get_turf(user), 8, asoundin = 'sound/effects/phasein.ogg')
|
||||
|
||||
@@ -476,7 +476,7 @@
|
||||
|
||||
RG.reagents.add_reagent(/singleton/reagent/water, min(RG.volume - RG.reagents.total_volume, amount_per_transfer_from_this))
|
||||
user.visible_message("<b>[user]</b> fills \a [RG] using \the [src].",
|
||||
SPAN_NOTICE("You fill \a [RG] using \the [src]."))
|
||||
SPAN_NOTICE("You fill \a [RG] using \the [src]."))
|
||||
playsound(loc, 'sound/effects/sink.ogg', 75, 1)
|
||||
if ("Empty")
|
||||
if(!RG.reagents.total_volume)
|
||||
@@ -501,7 +501,7 @@
|
||||
var/trans = min(S.volume - S.reagents.total_volume, S.amount_per_transfer_from_this)
|
||||
S.reagents.add_reagent(/singleton/reagent/water, trans)
|
||||
user.visible_message(SPAN_NOTICE("[usr] uses \the [S] to draw water from \the [src]."),
|
||||
SPAN_NOTICE("You draw [trans] units of water from \the [src]. \The [S] now contains [S.reagents.total_volume] units."))
|
||||
SPAN_NOTICE("You draw [trans] units of water from \the [src]. \The [S] now contains [S.reagents.total_volume] units."))
|
||||
if(1) // inject
|
||||
if(!S.reagents.total_volume)
|
||||
to_chat(usr, SPAN_WARNING("\The [S] is already empty."))
|
||||
@@ -510,7 +510,7 @@
|
||||
var/trans = min(S.amount_per_transfer_from_this, S.reagents.total_volume)
|
||||
S.reagents.remove_any(trans)
|
||||
user.visible_message(SPAN_NOTICE("[usr] empties \the [S] into \the [src]."),
|
||||
SPAN_NOTICE("You empty [trans] units of water into \the [src]. \The [S] now contains [S.reagents.total_volume] units."))
|
||||
SPAN_NOTICE("You empty [trans] units of water into \the [src]. \The [S] now contains [S.reagents.total_volume] units."))
|
||||
return
|
||||
|
||||
else if (istype(O, /obj/item/melee/baton))
|
||||
|
||||
Reference in New Issue
Block a user