[MIRROR] Ammo cleanup (#2643)

* Ammo cleanup * Update briefcase.dm * Update manned_turret.dm * Update mime.dm * Update manned_turret.dm * Update manned_turret.dm * fixes * mime memes
2017-09-22 22:30:44 -05:00
parent 235236c5a9
commit 6efb76fad5
18 changed files with 1062 additions and 982 deletions
@@ -1,57 +1,56 @@
-/obj/item/storage/briefcase
-	name = "briefcase"
-	desc = "It's made of AUTHENTIC faux-leather and has a price-tag still attached. Its owner must be a real professional."
-	icon_state = "briefcase"
-	lefthand_file = 'icons/mob/inhands/equipment/briefcase_lefthand.dmi'
-	righthand_file = 'icons/mob/inhands/equipment/briefcase_righthand.dmi'
-	flags_1 = CONDUCT_1
-	force = 8
-	hitsound = "swing_hit"
-	throw_speed = 2
-	throw_range = 4
-	w_class = WEIGHT_CLASS_BULKY
-	max_w_class = WEIGHT_CLASS_NORMAL
-	max_combined_w_class = 21
-	attack_verb = list("bashed", "battered", "bludgeoned", "thrashed", "whacked")
-	resistance_flags = FLAMMABLE
-	max_integrity = 150
-	var/folder_path = /obj/item/folder //this is the path of the folder that gets spawned in New()
-
-/obj/item/storage/briefcase/PopulateContents()
-	new /obj/item/pen(src)
-	var/obj/item/folder/folder = new folder_path(src)
-	for(var/i in 1 to 6)
-		new /obj/item/paper(folder)
-
-/obj/item/storage/briefcase/lawyer
-	folder_path = /obj/item/folder/blue
-
-/obj/item/storage/briefcase/lawyer/PopulateContents()
-	new /obj/item/stamp/law(src)
-	..()
-
-/obj/item/storage/briefcase/sniperbundle
-	name = "briefcase"
-	desc = "It's label reads genuine hardened Captain leather, but suspiciously has no other tags or branding. Smells like L'Air du Temps."
-	icon_state = "briefcase"
-	flags_1 = CONDUCT_1
-	force = 10
-	hitsound = "swing_hit"
-	throw_speed = 2
-	throw_range = 4
-	w_class = WEIGHT_CLASS_BULKY
-	max_w_class = WEIGHT_CLASS_NORMAL
-	max_combined_w_class = 21
-	attack_verb = list("bashed", "battered", "bludgeoned", "thrashed", "whacked")
-	resistance_flags = FLAMMABLE
-	max_integrity = 150
-
-/obj/item/storage/briefcase/sniperbundle/PopulateContents()
-	..() // in case you need any paperwork done after your rampage
-	new /obj/item/gun/ballistic/automatic/sniper_rifle/syndicate(src)
-	new /obj/item/clothing/neck/tie/red(src)
-	new /obj/item/clothing/under/syndicate/sniper(src)
-	new /obj/item/ammo_box/magazine/sniper_rounds/soporific(src)
-	new /obj/item/ammo_box/magazine/sniper_rounds/haemorrhage(src)
-	new /obj/item/suppressor/specialoffer(src)
-
+/obj/item/storage/briefcase
+	name = "briefcase"
+	desc = "It's made of AUTHENTIC faux-leather and has a price-tag still attached. Its owner must be a real professional."
+	icon_state = "briefcase"
+	lefthand_file = 'icons/mob/inhands/equipment/briefcase_lefthand.dmi'
+	righthand_file = 'icons/mob/inhands/equipment/briefcase_righthand.dmi'
+	flags_1 = CONDUCT_1
+	force = 8
+	hitsound = "swing_hit"
+	throw_speed = 2
+	throw_range = 4
+	w_class = WEIGHT_CLASS_BULKY
+	max_w_class = WEIGHT_CLASS_NORMAL
+	max_combined_w_class = 21
+	attack_verb = list("bashed", "battered", "bludgeoned", "thrashed", "whacked")
+	resistance_flags = FLAMMABLE
+	max_integrity = 150
+	var/folder_path = /obj/item/folder //this is the path of the folder that gets spawned in New()
+
+/obj/item/storage/briefcase/PopulateContents()
+	new /obj/item/pen(src)
+	var/obj/item/folder/folder = new folder_path(src)
+	for(var/i in 1 to 6)
+		new /obj/item/paper(folder)
+
+/obj/item/storage/briefcase/lawyer
+	folder_path = /obj/item/folder/blue
+
+/obj/item/storage/briefcase/lawyer/PopulateContents()
+	new /obj/item/stamp/law(src)
+	..()
+
+/obj/item/storage/briefcase/sniperbundle
+	name = "briefcase"
+	desc = "It's label reads genuine hardened Captain leather, but suspiciously has no other tags or branding. Smells like L'Air du Temps."
+	icon_state = "briefcase"
+	flags_1 = CONDUCT_1
+	force = 10
+	hitsound = "swing_hit"
+	throw_speed = 2
+	throw_range = 4
+	w_class = WEIGHT_CLASS_BULKY
+	max_w_class = WEIGHT_CLASS_NORMAL
+	max_combined_w_class = 21
+	attack_verb = list("bashed", "battered", "bludgeoned", "thrashed", "whacked")
+	resistance_flags = FLAMMABLE
+	max_integrity = 150
+
+/obj/item/storage/briefcase/sniperbundle/PopulateContents()
+	..() // in case you need any paperwork done after your rampage
+	new /obj/item/gun/ballistic/automatic/sniper_rifle/syndicate(src)
+	new /obj/item/clothing/neck/tie/red(src)
+	new /obj/item/clothing/under/syndicate/sniper(src)
+	new /obj/item/ammo_box/magazine/sniper_rounds/soporific(src)
+	new /obj/item/ammo_box/magazine/sniper_rounds/soporific(src)
+	new /obj/item/suppressor/specialoffer(src)