Merge pull request #5697 from Michiyamenotehifunana/Great-Trigonometric-Sprite-Replacement

The Great Trigonometric Sprite Replacement, Phase 1!

modular_citadel/code/game/objects/tools.dm

@@ -0,0 +1,18 @@
+/*
+// OVERRIDES FOR TOOL SPRITES GO HERE
+*/
+
+//CROWBAR
+
+/obj/item/crowbar
+	icon = 'modular_citadel/icons/obj/tools.dmi'
+
+//WIRECUTTERS	disabled pending better sprites
+/*
+/obj/item/wirecutters
+	icon = 'modular_citadel/icons/obj/tools.dmi'
+*/
+//WRENCH
+
+/obj/item/wrench
+	icon = 'modular_citadel/icons/obj/tools.dmi'

modular_citadel/code/modules/projectiles/guns/ballistic/revolver.dm

@@ -0,0 +1,11 @@
+/*
+//	REVOLVER THINGS GO HERE
+*/
+
+/obj/item/gun/ballistic/revolver		//regular, classic sprite
+	name = "\improper .357 revolver"
+	desc = "A typical revolver. Uses .357 ammo."
+
+/obj/item/gun/ballistic/revolver/syndie		//New and improved 100% syndicate technology!
+	desc = "A suspicious revolver. Uses .357 ammo."
+	icon = 'modular_citadel/icons/obj/guns/revolver.dmi'

modular_citadel/code/modules/projectiles/guns/energy/energy_gun.dm

@@ -0,0 +1,5 @@
+/obj/item/gun/energy/e_gun
+	icon = 'modular_citadel/icons/obj/guns/energy.dmi'
+	ammo_x_offset = 2
+	flight_x_offset = 17
+	flight_y_offset = 11

modular_citadel/code/modules/uplink/uplink_items.dm

@@ -0,0 +1,6 @@
+/*
+//	PUT ALL YOUR NEW UPLINK STUFF HERE, OVERRIDES GO IN HERE TOO
+*/
+
+/datum/uplink_item/dangerous/revolver
+	item = /obj/item/gun/ballistic/revolver/syndie

tgstation.dme

@@ -2552,6 +2552,7 @@
 #include "modular_citadel\code\game\machinery\vending.dm"
 #include "modular_citadel\code\game\machinery\computer\card.dm"
 #include "modular_citadel\code\game\objects\ids.dm"
+#include "modular_citadel\code\game\objects\tools.dm"
 #include "modular_citadel\code\game\objects\items\handcuffs.dm"
 #include "modular_citadel\code\game\objects\items\holy_weapons.dm"
 #include "modular_citadel\code\game\objects\items\stunsword.dm"
@@ -2617,9 +2618,12 @@
 #include "modular_citadel\code\modules\mob\living\simple_animal\banana_spider.dm"
 #include "modular_citadel\code\modules\mob\living\simple_animal\kiwi.dm"
 #include "modular_citadel\code\modules\power\lighting.dm"
+#include "modular_citadel\code\modules\projectiles\guns\ballistic\revolver.dm"
+#include "modular_citadel\code\modules\projectiles\guns\energy\energy_gun.dm"
 #include "modular_citadel\code\modules\research\designs\autoylathe_designs.dm"
 #include "modular_citadel\code\modules\research\designs\machine_designs.dm"
 #include "modular_citadel\code\modules\research\techweb\_techweb.dm"
 #include "modular_citadel\code\modules\research\techweb\all_nodes.dm"
+#include "modular_citadel\code\modules\uplink\uplink_items.dm"
 #include "modular_citadel\interface\skin.dmf"
 // END_INCLUDE