Code formatting, EOL at EOF fixes, refactoring

2026-08-23 03:57:48 +01:00 · 2014-12-18 03:11:49 +01:00
parent edffbc680d
commit 4882074739
137 changed files with 197 additions and 243 deletions
@@ -21,4 +21,4 @@
 			else
 				sign_type = replacetext(lowertext(sign_type), " ", "") // lowercase, strip spaces - along with choices for user options, avoids huge if-else-else
 				src.ChangeSign(sign_type)
-				user << "You change the barsign."
+				user << "You change the barsign."
@@ -93,8 +93,6 @@ LINEN BINS
 	item_color = "brown"


-
-
 /obj/structure/bedsheetbin
 	name = "linen bin"
 	desc = "A linen bin. It looks rather cosy."
@@ -183,4 +181,4 @@ LINEN BINS
 			hidden = null


-	add_fingerprint(user)
+	add_fingerprint(user)
@@ -50,4 +50,4 @@
 	if (istype(coat, /obj/item/clothing/suit/storage/toggle/labcoat/cmo))
 		overlays += image(icon, icon_state = "coat_cmo")
 	if (istype(coat, /obj/item/clothing/suit/storage/det_suit))
-		overlays += image(icon, icon_state = "coat_det")
+		overlays += image(icon, icon_state = "coat_det")
@@ -305,4 +305,4 @@
 	visible_message("<span class='danger'>[user] [attack_message] the [src]!</span>")
 	dump_contents()
 	spawn(1) del(src)
-	return 1
+	return 1
@@ -9,4 +9,4 @@
 	if(!opened)
 		icon_state = icon_closed
 	else
-		icon_state = icon_opened
+		icon_state = icon_opened
@@ -3,4 +3,4 @@
 	desc = "A crate which can sustain life for a while."
 	icon_state = "critter"
 	icon_opened = "critteropen"
-	icon_closed = "critter"
+	icon_closed = "critter"
@@ -207,4 +207,4 @@
 		return

 	close()
-		return
+		return
@@ -71,4 +71,4 @@
 	new /obj/item/weapon/gun/energy/laser/bluetag(src)
 	new /obj/item/weapon/gun/energy/laser/bluetag(src)
 	new /obj/item/clothing/suit/bluetag(src)
-	new /obj/item/clothing/suit/bluetag(src)
+	new /obj/item/clothing/suit/bluetag(src)
@@ -134,4 +134,3 @@
 	new /obj/item/clothing/head/helmet/thunderdome(src)
 	new /obj/item/clothing/head/helmet/thunderdome(src)
 	new /obj/item/clothing/head/helmet/thunderdome(src)
-
@@ -97,4 +97,4 @@
 	new /obj/item/clothing/under/lawyer/purpsuit(src)
 	new /obj/item/clothing/suit/storage/lawyer/purpjacket(src)
 	new /obj/item/clothing/shoes/brown(src)
-	new /obj/item/clothing/shoes/black(src)
+	new /obj/item/clothing/shoes/black(src)
@@ -70,4 +70,4 @@
 	..()
 	contents = list()
 	new /obj/item/clothing/suit/bio_suit/scientist( src )
-	new /obj/item/clothing/head/bio_hood/scientist( src )
+	new /obj/item/clothing/head/bio_hood/scientist( src )
@@ -1,4 +1,3 @@
-
 /obj/structure/closet/malf/suits
 	desc = "It's a storage unit for operational gear."
 	icon_state = "syndicate"
@@ -13,4 +12,4 @@
 	new /obj/item/clothing/suit/space/void(src)
 	new /obj/item/weapon/crowbar(src)
 	new /obj/item/weapon/cell(src)
-	new /obj/item/device/multitool(src)
+	new /obj/item/device/multitool(src)
@@ -33,4 +33,4 @@
 			else
 				icon_state = icon_closed
 		else
-			icon_state = icon_opened
+			icon_state = icon_opened
@@ -40,4 +40,4 @@
 		new /obj/item/clothing/mask/gas(src)
 		new /obj/item/clothing/glasses/meson(src)
 		new /obj/item/clothing/head/soft(src)
-		return
+		return
@@ -91,11 +91,3 @@
 		for(var/i = 0, i < 6, i++)
 			new /obj/item/weapon/spacecash/c200(src)
 		return
-
-
-
-
-
-
-
-
@@ -50,4 +50,4 @@
 		else if (locked)
 			overlays += icon(src.icon,"locked")
 		else
-			overlays += icon(src.icon,"open")
+			overlays += icon(src.icon,"open")
@@ -24,4 +24,4 @@
 		new /obj/item/weapon/minihoe(src)
 		new /obj/item/weapon/hatchet(src)
 //		new /obj/item/weapon/bee_net(src) //No more bees, March 2014
-		return
+		return
@@ -1,6 +1,6 @@
 /obj/structure/closet/secure_closet/personal
-	desc = "It's a secure locker for personnel. The first card swiped gains control."
 	name = "personal closet"
+	desc = "It's a secure locker for personnel. The first card swiped gains control."
 	req_access = list(access_all_personal_lockers)
 	var/registered_name = null

@@ -120,4 +120,4 @@
 			src.icon_state = src.icon_locked
 			src.registered_name = null
 			src.desc = "It's a secure locker for personnel. The first card swiped gains control."
-	return
+	return
@@ -48,4 +48,4 @@
 		new /obj/item/weapon/tank/air(src)
 		new /obj/item/clothing/mask/gas(src)
 		new /obj/item/device/flash(src)
-		return
+		return
@@ -128,4 +128,4 @@
 		if(welded)
 			overlays += "welded"
 	else
-		icon_state = icon_opened
+		icon_state = icon_opened
@@ -144,4 +144,4 @@
 				var/obj/item/stack/R = new res(src)
 				R.amount = R.max_amount

-		return
+		return
@@ -230,4 +230,4 @@
 	if(!opened)
 		icon_state = icon_closed
 	else
-		icon_state = icon_opened
+		icon_state = icon_opened
@@ -420,4 +420,4 @@
 	new /obj/item/clothing/under/suit_jacket/female(src)
 	new /obj/item/clothing/under/suit_jacket/really_black(src)
 	new /obj/item/clothing/under/suit_jacket/red(src)
-	new /obj/item/clothing/under/scratch(src)
+	new /obj/item/clothing/under/scratch(src)
@@ -486,4 +486,4 @@
 //		new /obj/item/weapon/weedspray(src)
 //		new /obj/item/weapon/pestspray(src)
 //		new /obj/item/weapon/pestspray(src)
-//		new /obj/item/weapon/pestspray(src)
+//		new /obj/item/weapon/pestspray(src)
@@ -77,4 +77,4 @@
 		ME.attach(H)
 		ME = new /obj/item/mecha_parts/mecha_equipment/tool/passenger
 		ME.attach(H)
-	..()
+	..()
@@ -1,6 +1,6 @@
 /obj/structure/curtain
-	icon = 'icons/obj/curtain.dmi'
 	name = "curtain"
+	icon = 'icons/obj/curtain.dmi'
 	icon_state = "closed"
 	layer = MOB_LAYER + 0.1
 	opacity = 1
@@ -92,5 +92,3 @@
 		src.health -= 2
 		healthcheck()
 		return
-
-
@@ -1,7 +1,6 @@
 obj/structure/door_assembly
-	icon = 'icons/obj/doors/door_assembly.dmi'
-
 	name = "airlock assembly"
+	icon = 'icons/obj/doors/door_assembly.dmi'
 	icon_state = "door_as_0"
 	anchored = 0
 	density = 1
@@ -17,91 +16,91 @@ obj/structure/door_assembly
 	New()
 		update_state()

-	door_assembly_com
+obj/structure/door_assembly/door_assembly_com
 		base_icon_state = "com"
 		base_name = "Command Airlock"
 		glass_type = "/glass_command"
 		airlock_type = "/command"

-	door_assembly_sec
+obj/structure/door_assembly/door_assembly_sec
 		base_icon_state = "sec"
 		base_name = "Security Airlock"
 		glass_type = "/glass_security"
 		airlock_type = "/security"

-	door_assembly_eng
+obj/structure/door_assembly/door_assembly_eng
 		base_icon_state = "eng"
 		base_name = "Engineering Airlock"
 		glass_type = "/glass_engineering"
 		airlock_type = "/engineering"

-	door_assembly_min
+obj/structure/door_assembly/door_assembly_min
 		base_icon_state = "min"
 		base_name = "Mining Airlock"
 		glass_type = "/glass_mining"
 		airlock_type = "/mining"

-	door_assembly_atmo
+obj/structure/door_assembly/door_assembly_atmo
 		base_icon_state = "atmo"
 		base_name = "Atmospherics Airlock"
 		glass_type = "/glass_atmos"
 		airlock_type = "/atmos"

-	door_assembly_research
+obj/structure/door_assembly/door_assembly_research
 		base_icon_state = "res"
 		base_name = "Research Airlock"
 		glass_type = "/glass_research"
 		airlock_type = "/research"

-	door_assembly_science
+obj/structure/door_assembly/door_assembly_science
 		base_icon_state = "sci"
 		base_name = "Science Airlock"
 		glass_type = "/glass_science"
 		airlock_type = "/science"

-	door_assembly_med
+obj/structure/door_assembly/door_assembly_med
 		base_icon_state = "med"
 		base_name = "Medical Airlock"
 		glass_type = "/glass_medical"
 		airlock_type = "/medical"

-	door_assembly_mai
+obj/structure/door_assembly/door_assembly_mai
 		base_icon_state = "mai"
 		base_name = "Maintenance Airlock"
 		airlock_type = "/maintenance"
 		glass = -1

-	door_assembly_ext
+obj/structure/door_assembly/door_assembly_ext
 		base_icon_state = "ext"
 		base_name = "External Airlock"
 		airlock_type = "/external"
 		glass = -1

-	door_assembly_fre
+obj/structure/door_assembly/door_assembly_fre
 		base_icon_state = "fre"
 		base_name = "Freezer Airlock"
 		airlock_type = "/freezer"
 		glass = -1

-	door_assembly_hatch
+obj/structure/door_assembly/door_assembly_hatch
 		base_icon_state = "hatch"
 		base_name = "Airtight Hatch"
 		airlock_type = "/hatch"
 		glass = -1

-	door_assembly_mhatch
+obj/structure/door_assembly/door_assembly_mhatch
 		base_icon_state = "mhatch"
 		base_name = "Maintenance Hatch"
 		airlock_type = "/maintenance_hatch"
 		glass = -1

-	door_assembly_highsecurity // Borrowing this until WJohnston makes sprites for the assembly
+obj/structure/door_assembly/door_assembly_highsecurity // Borrowing this until WJohnston makes sprites for the assembly
 		base_icon_state = "highsec"
 		base_name = "High Security Airlock"
 		airlock_type = "/highsecurity"
 		glass = -1

-	multi_tile
+obj/structure/door_assembly/multi_tile
 		icon = 'icons/obj/doors/door_assembly2x1.dmi'
 		dir = EAST
 		var/width = 1
@@ -74,4 +74,4 @@

 	A.power_light = light
 	A.updateicon()
-	return
+	return
@@ -331,4 +331,3 @@
 	desc = "A wall with sandstone plating."
 	icon_state = ""
 	mineral = "sandstone"
-//------------wtf?------------end
@@ -193,4 +193,4 @@

 /obj/structure/flora/ausbushes/fullgrass/New()
 	..()
-	icon_state = "fullgrass_[rand(1, 3)]"
+	icon_state = "fullgrass_[rand(1, 3)]"
@@ -268,4 +268,4 @@
 				del(src)
 			return
 		else
-	return
+	return
@@ -1,6 +1,6 @@
 /obj/structure/grille
-	desc = "A flimsy lattice of metal rods, with screws to secure it to the floor."
 	name = "grille"
+	desc = "A flimsy lattice of metal rods, with screws to secure it to the floor."
 	icon = 'icons/obj/structures.dmi'
 	icon_state = "grille"
 	density = 1
@@ -189,4 +189,4 @@
 	visible_message("<span class='danger'>[user] [attack_verb] the [src]!</span>")
 	health -= damage
 	spawn(1) healthcheck()
-	return 1
+	return 1
@@ -299,4 +299,4 @@
 	desc = "A keyring with a small steel key, and a pink fob reading \"Pussy Wagon\"."
 	icon = 'icons/obj/vehicles.dmi'
 	icon_state = "keys"
-	w_class = 1
+	w_class = 1
@@ -75,4 +75,4 @@
 					new /obj/item/weapon/reagent_containers/food/snacks/xenomeat(src.loc)
 					usr << "You remove the last piece of meat from the alien!"
 					src.icon_state = "spike"
-					src.occupied = 0
+					src.occupied = 0
@@ -67,4 +67,4 @@
 	add_fingerprint(user)

 /obj/structure/ladder/attackby(obj/item/weapon/W, mob/user as mob)
-	return attack_hand(user)
+	return attack_hand(user)
@@ -98,4 +98,4 @@
 	gender = FEMALE

 /obj/item/clothing/mask/facehugger/lamarr/New()//to prevent deleting it if aliums are disabled
-	return
+	return
@@ -1,6 +1,6 @@
 /obj/structure/lattice
-	desc = "A lightweight support lattice."
 	name = "lattice"
+	desc = "A lightweight support lattice."
 	icon = 'icons/obj/structures.dmi'
 	icon_state = "latticefull"
 	density = 0
@@ -284,4 +284,3 @@
 	CheckHardness()
 		playsound(loc, 'sound/effects/attackblob.ogg', 100, 1)
 		..()
-
@@ -100,4 +100,4 @@
 		shatter()
 	else
 		user.visible_message("<span class='danger'>[user] hits [src] and bounces off!</span>")
-	return 1
+	return 1
@@ -24,4 +24,4 @@
 		else
 			reagents.trans_to(I, 5)
 			user << "<span class='notice'>You wet [I] in [src].</span>"
-			playsound(loc, 'sound/effects/slosh.ogg', 25, 1)
+			playsound(loc, 'sound/effects/slosh.ogg', 25, 1)
@@ -388,4 +388,3 @@
 	else
 		usr << "\red Access denied."
 	return
-
@@ -188,4 +188,4 @@ obj/structure/safe/meteorhit(obj/O as obj)


 /obj/structure/safe/floor/hide(var/intact)
-	invisibility = intact ? 101 : 0
+	invisibility = intact ? 101 : 0
@@ -175,4 +175,4 @@
 	icon_state = "officechair_white"

 /obj/structure/stool/bed/chair/office/dark
-	icon_state = "officechair_dark"
+	icon_state = "officechair_dark"
@@ -189,4 +189,4 @@
 	if(M == pulling)
 		pulling = null
 		usr.pulledby = null
-	..()
+	..()
@@ -584,4 +584,4 @@
 		return
 	user.drop_item()
 	if(W && W.loc)	W.loc = src.loc
-	return
+	return
@@ -116,4 +116,4 @@
 	else
 		usr << browse(null, "window=dispenser")
 		return
-	return
+	return
@@ -49,4 +49,4 @@
 				pinned_target.loc = get_turf(user)
 				user << "You take the target out of the stake."

-			pinned_target = null
+			pinned_target = null