cyberpresidentvanellope/Paradise
1
0
Fork 0
mirror of https://github.com/ParadiseSS13/Paradise.git synced 2026-08-26 05:27:01 +01:00
Code Issues Packages Projects Releases Wiki Activity

Whitespace cleanup part 4. (#20226)

Browse Source
This commit is contained in:
warriorstar-orion
2023-01-20 19:40:42 -05:00
committed by GitHub
parent 0120b5e226
commit b790e6d5e2
13 changed files with 81 additions and 81 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/modules/events/carp_migration.dm
+2 -2
View File
@@ -3,8 +3,8 @@
endWhen = 900
var/list/spawned_mobs = list(
/mob/living/simple_animal/hostile/carp = 95,
/mob/living/simple_animal/hostile/carp/megacarp = 5)
/mob/living/simple_animal/hostile/carp = 95,
/mob/living/simple_animal/hostile/carp/megacarp = 5)
/datum/event/carp_migration/setup()
announceWhen = rand(40, 60)
code/modules/martial_arts/cqc.dm
+1 -1
View File
@@ -65,7 +65,7 @@
else
playsound(get_turf(D), 'sound/weapons/cqchit1.ogg', 10, 1, -1)
D.visible_message("<span class='danger'>[A] [picked_hit_type] [D]!</span>", \
"<span class='userdanger'>[A] [picked_hit_type] you!</span>")
"<span class='userdanger'>[A] [picked_hit_type] you!</span>")
add_attack_logs(A, D, "Melee attacked with martial-art [src] : [picked_hit_type]", ATKLOG_ALL)
if(IS_HORIZONTAL(A) && !IS_HORIZONTAL(D))
D.visible_message("<span class='warning'>[A] leg sweeps [D]!", \
code/modules/mob/living/carbon/human/inventory.dm
+10 -10
View File
@@ -434,13 +434,13 @@
qdel(slot)
/mob/living/carbon/human/proc/quick_equip_item(slot_item) // puts things in belt or bag
var/obj/item/thing = get_active_hand()
var/obj/item/storage/equipped_item = get_item_by_slot(slot_item)
if(ismecha(loc) || HAS_TRAIT(src, TRAIT_HANDS_BLOCKED))
return
if(!istype(equipped_item)) // We also let you equip things like this
equip_to_slot_if_possible(thing, slot_item)
return
if(thing && equipped_item.can_be_inserted(thing)) // put thing in belt or bag
equipped_item.handle_item_insertion(thing)
playsound(loc, "rustle", 50, 1, -5)
var/obj/item/thing = get_active_hand()
var/obj/item/storage/equipped_item = get_item_by_slot(slot_item)
if(ismecha(loc) || HAS_TRAIT(src, TRAIT_HANDS_BLOCKED))
return
if(!istype(equipped_item)) // We also let you equip things like this
equip_to_slot_if_possible(thing, slot_item)
return
if(thing && equipped_item.can_be_inserted(thing)) // put thing in belt or bag
equipped_item.handle_item_insertion(thing)
playsound(loc, "rustle", 50, 1, -5)
code/modules/reagents/chemistry/reagents/misc.dm
+3 -3
View File
@@ -333,9 +333,9 @@
return ..()
/datum/reagent/colorful_reagent/reaction_mob(mob/living/simple_animal/M, method=REAGENT_TOUCH, volume)
if(isanimal(M))
M.color = pick(GLOB.random_color_list)
..()
if(isanimal(M))
M.color = pick(GLOB.random_color_list)
..()
/datum/reagent/colorful_reagent/reaction_obj(obj/O, volume)
O.color = pick(GLOB.random_color_list)
code/modules/reagents/reagent_containers/glass_containers.dm
+5 -5
View File
@@ -312,11 +312,11 @@
resistance_flags = FLAMMABLE
/obj/item/reagent_containers/glass/bucket/equipped(mob/user, slot)
..()
if(slot == slot_head && reagents.total_volume)
to_chat(user, "<span class='userdanger'>[src]'s contents spill all over you!</span>")
reagents.reaction(user, REAGENT_TOUCH)
reagents.clear_reagents()
..()
if(slot == slot_head && reagents.total_volume)
to_chat(user, "<span class='userdanger'>[src]'s contents spill all over you!</span>")
reagents.reaction(user, REAGENT_TOUCH)
reagents.clear_reagents()
/obj/item/reagent_containers/glass/bucket/attackby(obj/D, mob/user, params)
if(istype(D, /obj/item/mop))
code/modules/shuttle/on_move.dm
+16 -16
View File
@@ -11,12 +11,12 @@
return 1
/obj/effect/landmark/shuttle_import/onShuttleMove()
// Used for marking where to preview/load shuttles
return 0
// Used for marking where to preview/load shuttles
return 0
/obj/docking_port/onShuttleMove()
// Stationary ports shouldn't move, mobile ones move themselves
return 0
// Stationary ports shouldn't move, mobile ones move themselves
return 0
/obj/machinery/door/airlock/onShuttleMove()
. = ..()
@@ -33,20 +33,20 @@
INVOKE_ASYNC(src, PROC_REF(lock))
/mob/onShuttleMove(turf/oldT, turf/T1, rotation)
if(!move_on_shuttle)
return 0
. = ..()
if(!.)
return
if(!client)
return
if(!move_on_shuttle)
return 0
. = ..()
if(!.)
return
if(!client)
return
if(buckled)
shake_camera(src, 2, 1) // turn it down a bit come on
else
shake_camera(src, 7, 1)
if(buckled)
shake_camera(src, 2, 1) // turn it down a bit come on
else
shake_camera(src, 7, 1)
update_parallax_contents()
update_parallax_contents()
/mob/living/carbon/onShuttleMove()
. = ..()
code/modules/space_management/level_check.dm
+3 -3
View File
@@ -1,7 +1,7 @@
/proc/is_on_level_name(atom/A,name)
var/datum/space_level/S = GLOB.space_manager.get_zlev_by_name(name)
return A.z == S.zpos
var/datum/space_level/S = GLOB.space_manager.get_zlev_by_name(name)
return A.z == S.zpos
// For expansion later
/proc/atoms_share_level(atom/A, atom/B)
return A && B && A.z == B.z
return A && B && A.z == B.z
code/modules/supply/supply_packs/pack_medical.dm
+3 -3
View File
@@ -22,9 +22,9 @@
/obj/item/reagent_containers/iv_bag/salglu,
/obj/item/storage/box/beakers,
/obj/item/storage/box/syringes,
/obj/item/storage/box/bodybags,
/obj/item/storage/box/iv_bags,
/obj/item/vending_refill/medical)
/obj/item/storage/box/bodybags,
/obj/item/storage/box/iv_bags,
/obj/item/vending_refill/medical)
cost = 400
containertype = /obj/structure/closet/crate/medical
containername = "medical supplies crate"
code/modules/surgery/organs/organ_internal.dm
+1 -1
View File
@@ -87,7 +87,7 @@
receive_damage(7, 1)
/obj/item/organ/internal/replaced(mob/living/carbon/human/target)
insert(target)
insert(target)
/obj/item/organ/internal/item_action_slot_check(slot, mob/user)
return
code/modules/unit_tests/spawn_humans.dm
+4 -4
View File
@@ -1,8 +1,8 @@
/datum/unit_test/spawn_humans/Run()
var/locs = block(run_loc_bottom_left, run_loc_top_right)
var/locs = block(run_loc_bottom_left, run_loc_top_right)
for(var/I in 1 to 5)
new /mob/living/carbon/human(pick(locs))
for(var/I in 1 to 5)
new /mob/living/carbon/human(pick(locs))
// There is a 5 second delay here so that all the items on the humans have time to initialize and spawn
sleep(50)
sleep(50)
code/modules/vehicle/ambulance.dm
+9 -9
View File
@@ -49,18 +49,18 @@
/datum/looping_sound/ambulance_alarm
start_length = 0
mid_sounds = list('sound/items/weeoo1.ogg' = 1)
mid_length = 14
volume = 100
start_length = 0
mid_sounds = list('sound/items/weeoo1.ogg' = 1)
mid_length = 14
volume = 100
/obj/vehicle/ambulance/post_buckle_mob(mob/living/M)
. = ..()
if(has_buckled_mobs())
AA.Grant(M)
else
AA.Remove(M)
. = ..()
if(has_buckled_mobs())
AA.Grant(M)
else
AA.Remove(M)
/obj/vehicle/ambulance/post_unbuckle_mob(mob/living/M)
AA.Remove(M)