diff --git a/modular_citadel/code/game/objects/tools.dm b/modular_citadel/code/game/objects/tools.dm new file mode 100644 index 0000000000..5a6cd9bf42 --- /dev/null +++ b/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' \ No newline at end of file diff --git a/modular_citadel/code/modules/projectiles/guns/ballistic/revolver.dm b/modular_citadel/code/modules/projectiles/guns/ballistic/revolver.dm new file mode 100644 index 0000000000..6fa18be0e7 --- /dev/null +++ b/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' \ No newline at end of file diff --git a/modular_citadel/code/modules/projectiles/guns/energy/energy_gun.dm b/modular_citadel/code/modules/projectiles/guns/energy/energy_gun.dm new file mode 100644 index 0000000000..a63849df81 --- /dev/null +++ b/modular_citadel/code/modules/projectiles/guns/energy/energy_gun.dm @@ -0,0 +1,7 @@ +/obj/item/gun/energy/e_gun + name = "particle blaster" + desc = "A basic hybrid particle blaster with two settings: disable and kill." + icon = 'modular_citadel/icons/obj/guns/energy.dmi' + ammo_x_offset = 2 + flight_x_offset = 17 + flight_y_offset = 11 \ No newline at end of file diff --git a/modular_citadel/code/modules/uplink/uplink_items.dm b/modular_citadel/code/modules/uplink/uplink_items.dm new file mode 100644 index 0000000000..5fcb76781e --- /dev/null +++ b/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 \ No newline at end of file diff --git a/modular_citadel/icons/obj/guns/energy.dmi b/modular_citadel/icons/obj/guns/energy.dmi new file mode 100644 index 0000000000..f34db811f0 Binary files /dev/null and b/modular_citadel/icons/obj/guns/energy.dmi differ diff --git a/modular_citadel/icons/obj/guns/revolver.dmi b/modular_citadel/icons/obj/guns/revolver.dmi new file mode 100644 index 0000000000..ce00ca506c Binary files /dev/null and b/modular_citadel/icons/obj/guns/revolver.dmi differ diff --git a/modular_citadel/icons/obj/tools.dmi b/modular_citadel/icons/obj/tools.dmi new file mode 100644 index 0000000000..4aead43984 Binary files /dev/null and b/modular_citadel/icons/obj/tools.dmi differ diff --git a/tgstation.dme b/tgstation.dme index a49437ef9d..7eda8c3c6a 100755 --- a/tgstation.dme +++ b/tgstation.dme @@ -2551,6 +2551,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" @@ -2616,9 +2617,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