Merge branch 'master' into donoritemmodularization

code/citadel/_cit_helpers.dm

@@ -121,7 +121,7 @@ GLOBAL_VAR_INIT(miscreants_allowed, FALSE)
 	prefs.chat_toggles ^= CHAT_LOOC
 	prefs.save_preferences()
 	src << "You will [(prefs.chat_toggles & CHAT_LOOC) ? "now" : "no longer"] see messages on the LOOC channel."
-	SSblackbox.add_details("admin_verb","TLOOC") //If you are copy-pasting this, ensure the 2nd parameter is unique to the new proc!
+	SSblackbox.record_feedback("tally", "admin_verb", 1, "TLOOC") //If you are copy-pasting this, ensure the 2nd parameter is unique to the new proc!
 
 /datum/admins/proc/togglelooc()
 	set category = "Server"
@@ -130,7 +130,7 @@ GLOBAL_VAR_INIT(miscreants_allowed, FALSE)
 	toggle_looc()
 	log_admin("[key_name(usr)] toggled LOOC.")
 	message_admins("[key_name_admin(usr)] toggled LOOC.")
-	SSblackbox.add_details("admin_verb","TLOOC") //If you are copy-pasting this, ensure the 2nd parameter is unique to the new proc!
+	SSblackbox.record_feedback("tally", "admin_verb", 1, "TLOOC") //If you are copy-pasting this, ensure the 2nd parameter is unique to the new proc!
 
 /proc/toggle_looc(toggle = null)
 	if(toggle != null) //if we're specifically en/disabling ooc
@@ -150,7 +150,7 @@ GLOBAL_VAR_INIT(miscreants_allowed, FALSE)
 
 	log_admin("[key_name(usr)] toggled Dead LOOC.")
 	message_admins("[key_name_admin(usr)] toggled Dead LOOC.")
-	SSblackbox.add_details("admin_verb","TDLOOC") //If you are copy-pasting this, ensure the 2nd parameter is unique to the new proc!
+	SSblackbox.record_feedback("tally", "admin_verb", 1, "TDLOOC") //If you are copy-pasting this, ensure the 2nd parameter is unique to the new proc!
 
 
 /mob/living/carbon/proc/has_penis()

code/citadel/cit_guns.dm

@@ -215,7 +215,7 @@
 	damage = 15
 	armour_penetration = 10
 	light_range = 2
-	speed = 1.2
+	speed = 0.6
 	range = 25
 	light_color = LIGHT_COLOR_RED
 
@@ -224,10 +224,10 @@
 	icon_state = "magjectile-nl"
 	damage = 1
 	knockdown = 0
-	stamina = 30
+	stamina = 25
 	armour_penetration = -10
 	light_range = 2
-	speed = 1.2
+	speed = 0.7
 	range = 25
 	light_color = LIGHT_COLOR_BLUE
 
@@ -257,7 +257,7 @@
 	origin_tech = "magnets=5"
 	ammo_type = /obj/item/ammo_casing/caseless/anlmags
 	caliber = "mags"
-	max_ammo = 7
+	max_ammo = 15
 	multiple_sprites = 2
 
 /obj/item/ammo_box/magazine/mmag/small/lethal
@@ -279,7 +279,7 @@
 	mag_type = /obj/item/ammo_box/magazine/mmag/small
 	can_suppress = 0
 	casing_ejector = 0
-	fire_delay = 5
+	fire_delay = 2
 	origin_tech = "combat=4;magnets=4"
 
 /obj/item/gun/ballistic/automatic/pistol/mag/update_icon()
@@ -389,7 +389,7 @@
 	damage = 20
 	armour_penetration = 25
 	light_range = 3
-	speed = 1.2
+	speed = 0.7
 	range = 35
 	light_color = LIGHT_COLOR_RED
 
@@ -398,10 +398,10 @@
 	icon_state = "magjectile-large-nl"
 	damage = 0
 	knockdown = 0
-	stamina = 35
+	stamina = 20
 	armour_penetration = -10
 	light_range = 3
-	speed = 1.0
+	speed = 0.65
 	range = 35
 	light_color = LIGHT_COLOR_BLUE
 
@@ -430,7 +430,7 @@
 	origin_tech = "magnets=6"
 	ammo_type = /obj/item/ammo_casing/caseless/anlmagm
 	caliber = "magm"
-	max_ammo = 15
+	max_ammo = 27
 	multiple_sprites = 2
 
 /obj/item/ammo_box/magazine/mmag/lethal
@@ -439,6 +439,7 @@
 	icon_state = "mediummagmag"
 	origin_tech = "combat=6"
 	ammo_type = /obj/item/ammo_casing/caseless/amagm
+	max_ammo = 21
 
 ///the gun itself///
 
@@ -455,7 +456,7 @@
 	can_suppress = 0
 	burst_size = 3
 	fire_delay = 2
-	spread = 30
+	spread = 20
 	recoil = 1
 	casing_ejector = 0
 

code/citadel/custom_loadout/custom_items.dm

@@ -111,6 +111,16 @@
 	resistance_flags = FLAMMABLE
 	squeak_override = list('sound/misc/server-ready.ogg'= 1)
 
+/obj/item/clothing/neck/cloak/festive
+	name = "Celebratory Cloak of Morozko"
+	desc = " It probably will protect from snow, charcoal or elves."
+	icon = 'icons/obj/custom.dmi'
+	icon_state = "festive-w"
+	item_state = "festive-i"
+	icon = 'icons/obj/custom.dmi'
+	w_class = WEIGHT_CLASS_SMALL
+	body_parts_covered = CHEST|GROIN|LEGS|ARMS
+
 
 /*Zigfie*/
 
@@ -213,4 +223,15 @@
 	item_state = "pink-w"
 
 
+/*Fractious*/
+
+/obj/item/clothing/suit/vermillion
+	name = "vermillion clothing"
+	desc = "Some clothing."
+	icon_state = "vermillion-w"
+	item_state = "vermillion-i"
+	body_parts_covered = CHEST|GROIN|LEGS|ARMS|HANDS
+	icon = 'icons/obj/custom.dmi'
+
+