mirror of
https://github.com/ParadiseSS13/Paradise.git
synced 2026-07-12 07:33:34 +01:00
File standardisation (#13131)
* Adds the check components * Adds in trailing newlines * Converts all CRLF to LF * Post merge EOF * Post merge line endings * Final commit
This commit is contained in:
@@ -214,4 +214,4 @@
|
||||
..()
|
||||
|
||||
/obj/structure/closet/crate/secure/loot/deconstruct(disassembled = TRUE)
|
||||
boom()
|
||||
boom()
|
||||
|
||||
@@ -94,4 +94,4 @@
|
||||
cut_overlays()
|
||||
var/mutable_appearance/glass_overlay = mutable_appearance(icon, "hostile_env_glass")
|
||||
glass_overlay.appearance_flags = RESET_COLOR
|
||||
add_overlay(glass_overlay)
|
||||
add_overlay(glass_overlay)
|
||||
|
||||
@@ -439,4 +439,4 @@
|
||||
new /obj/effect/temp_visual/hierophant/wall/crusher(otherT, user)
|
||||
|
||||
/obj/effect/temp_visual/hierophant/wall/crusher
|
||||
duration = 75
|
||||
duration = 75
|
||||
|
||||
@@ -119,4 +119,4 @@
|
||||
if(colorindex >= 6)
|
||||
colorindex = 0
|
||||
icon_state = "mobcap[colorindex]"
|
||||
update_icon()
|
||||
update_icon()
|
||||
|
||||
@@ -137,4 +137,4 @@ GLOBAL_LIST_INIT(marker_beacon_colors, list(
|
||||
return
|
||||
if(input_color)
|
||||
picked_color = input_color
|
||||
update_icon()
|
||||
update_icon()
|
||||
|
||||
@@ -82,4 +82,4 @@
|
||||
|
||||
/obj/effect/temp_visual/mining_overlay/Initialize(mapload)
|
||||
. = ..()
|
||||
animate(src, alpha = 0, time = duration, easing = EASE_IN)
|
||||
animate(src, alpha = 0, time = duration, easing = EASE_IN)
|
||||
|
||||
@@ -139,4 +139,4 @@
|
||||
desc = "A large tool for digging and moving dirt. Was modified with extra safety, making it ineffective as a weapon."
|
||||
force = 1
|
||||
throwforce = 1
|
||||
attack_verb = list("ineffectively hit")
|
||||
attack_verb = list("ineffectively hit")
|
||||
|
||||
@@ -135,4 +135,4 @@
|
||||
|
||||
/obj/item/organ/internal/regenerative_core/legion/preserved(implanted = 0)
|
||||
..()
|
||||
desc = "[src] has been stabilized. It is preserved, allowing you to use it to heal completely without danger of decay."
|
||||
desc = "[src] has been stabilized. It is preserved, allowing you to use it to heal completely without danger of decay."
|
||||
|
||||
@@ -113,4 +113,4 @@
|
||||
/obj/effect/temp_visual/resonance_crush/New()
|
||||
..()
|
||||
transform = matrix()*1.5
|
||||
animate(src, transform = matrix() * 0.1, alpha = 50, time = 4)
|
||||
animate(src, transform = matrix() * 0.1, alpha = 50, time = 4)
|
||||
|
||||
@@ -74,4 +74,4 @@
|
||||
L.Weaken(6)
|
||||
if(ishuman(L))
|
||||
shake_camera(L, 20, 1)
|
||||
addtimer(CALLBACK(L, /mob/living/carbon.proc/vomit), 20)
|
||||
addtimer(CALLBACK(L, /mob/living/carbon.proc/vomit), 20)
|
||||
|
||||
@@ -192,4 +192,4 @@ GLOBAL_LIST_EMPTY(total_extraction_beacons)
|
||||
return
|
||||
|
||||
/obj/effect/extraction_holder/singularity_pull()
|
||||
return
|
||||
return
|
||||
|
||||
@@ -24,4 +24,4 @@
|
||||
if(S && S.name == "laborcamp_away")
|
||||
to_chat(usr, "<span class='warning'>Shuttle is already at the outpost!</span>")
|
||||
return 0
|
||||
..()
|
||||
..()
|
||||
|
||||
@@ -183,4 +183,4 @@ GLOBAL_LIST(labor_sheet_values)
|
||||
else
|
||||
to_chat(user, "<span class='warning'>Error: Invalid ID</span>")
|
||||
return
|
||||
return ..()
|
||||
return ..()
|
||||
|
||||
@@ -277,4 +277,4 @@
|
||||
desc = "A bowl made out of mushrooms. Not food, though it might have contained some at some point."
|
||||
icon = 'icons/obj/lavaland/ash_flora.dmi'
|
||||
icon_state = "mushroom_bowl"
|
||||
w_class = WEIGHT_CLASS_SMALL
|
||||
w_class = WEIGHT_CLASS_SMALL
|
||||
|
||||
@@ -87,4 +87,4 @@
|
||||
to_chat(H, "<span class='userdanger'>You have an overwhelming desire to kill [L]. [L.p_they(TRUE)] [L.p_have()] been marked red! Go kill [L.p_them()]!</span>")
|
||||
H.put_in_hands(new /obj/item/kitchen/knife/butcher(H))
|
||||
|
||||
qdel(src)
|
||||
qdel(src)
|
||||
|
||||
@@ -282,4 +282,4 @@
|
||||
var/obj/effect/temp_visual/hierophant/blast/B = new(t, user, friendly_fire_check)
|
||||
B.damage = 15 //keeps monster damage boost due to lower damage
|
||||
|
||||
#undef HIEROPHANT_CLUB_CARDINAL_DAMAGE
|
||||
#undef HIEROPHANT_CLUB_CARDINAL_DAMAGE
|
||||
|
||||
@@ -218,4 +218,4 @@
|
||||
flags = NODROP | DROPDEL
|
||||
desc = "A short wooden rod with a mystical snake inseparably gripping itself and the rod to your forearm. It flows with a healing energy that disperses amongst yourself and those around you. "
|
||||
icon_state = "asclepius_active"
|
||||
activated = TRUE
|
||||
activated = TRUE
|
||||
|
||||
@@ -215,4 +215,4 @@
|
||||
var/O = new P(src)
|
||||
unload_mineral(O)
|
||||
|
||||
#undef SMELT_AMOUNT
|
||||
#undef SMELT_AMOUNT
|
||||
|
||||
@@ -396,4 +396,4 @@
|
||||
if(powered())
|
||||
icon_state = initial(icon_state)
|
||||
else
|
||||
icon_state = "[initial(icon_state)]-off"
|
||||
icon_state = "[initial(icon_state)]-off"
|
||||
|
||||
@@ -88,4 +88,4 @@
|
||||
var/obj/item/stack/sheet/out = new inp.type()
|
||||
out.amount = stack_amt
|
||||
unload_mineral(out)
|
||||
storage.amount -= stack_amt
|
||||
storage.amount -= stack_amt
|
||||
|
||||
@@ -29,4 +29,4 @@
|
||||
limit++
|
||||
if(limit>=10)
|
||||
return
|
||||
CHECK_TICK
|
||||
CHECK_TICK
|
||||
|
||||
@@ -92,4 +92,4 @@
|
||||
icon_state = "miningcar"
|
||||
density = 1
|
||||
icon_opened = "miningcaropen"
|
||||
icon_closed = "miningcar"
|
||||
icon_closed = "miningcar"
|
||||
|
||||
@@ -354,4 +354,4 @@
|
||||
qdel(src)
|
||||
|
||||
#undef MINEDRONE_COLLECT
|
||||
#undef MINEDRONE_ATTACK
|
||||
#undef MINEDRONE_ATTACK
|
||||
|
||||
@@ -101,4 +101,4 @@
|
||||
if(!M)
|
||||
M = new /obj/item/storage/bag/money(src)
|
||||
unload_mineral(M)
|
||||
O.forceMove(M)
|
||||
O.forceMove(M)
|
||||
|
||||
@@ -1,24 +1,24 @@
|
||||
/*****************************Money bag********************************/
|
||||
|
||||
/obj/item/storage/bag/money
|
||||
name = "money bag"
|
||||
icon_state = "moneybag"
|
||||
force = 10
|
||||
throwforce = 0
|
||||
resistance_flags = FLAMMABLE
|
||||
max_integrity = 100
|
||||
w_class = WEIGHT_CLASS_BULKY
|
||||
max_w_class = WEIGHT_CLASS_NORMAL
|
||||
storage_slots = 40
|
||||
max_combined_w_class = 40
|
||||
can_hold = list(/obj/item/coin, /obj/item/stack/spacecash)
|
||||
|
||||
/obj/item/storage/bag/money/vault/New()
|
||||
..()
|
||||
new /obj/item/coin/silver(src)
|
||||
new /obj/item/coin/silver(src)
|
||||
new /obj/item/coin/silver(src)
|
||||
new /obj/item/coin/silver(src)
|
||||
new /obj/item/coin/gold(src)
|
||||
new /obj/item/coin/gold(src)
|
||||
new /obj/item/coin/adamantine(src)
|
||||
/*****************************Money bag********************************/
|
||||
|
||||
/obj/item/storage/bag/money
|
||||
name = "money bag"
|
||||
icon_state = "moneybag"
|
||||
force = 10
|
||||
throwforce = 0
|
||||
resistance_flags = FLAMMABLE
|
||||
max_integrity = 100
|
||||
w_class = WEIGHT_CLASS_BULKY
|
||||
max_w_class = WEIGHT_CLASS_NORMAL
|
||||
storage_slots = 40
|
||||
max_combined_w_class = 40
|
||||
can_hold = list(/obj/item/coin, /obj/item/stack/spacecash)
|
||||
|
||||
/obj/item/storage/bag/money/vault/New()
|
||||
..()
|
||||
new /obj/item/coin/silver(src)
|
||||
new /obj/item/coin/silver(src)
|
||||
new /obj/item/coin/silver(src)
|
||||
new /obj/item/coin/silver(src)
|
||||
new /obj/item/coin/gold(src)
|
||||
new /obj/item/coin/gold(src)
|
||||
new /obj/item/coin/adamantine(src)
|
||||
|
||||
Reference in New Issue
Block a user