shikix/GS13NG
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Screw commit history.

Browse Source
This commit is contained in:
Ghommie
2020-02-02 01:26:04 +01:00
parent b1a571bf2d
commit 95db5084ab
267 changed files with 2201 additions and 1848 deletions
Download Patch File Download Diff File Expand all files Collapse all files
modular_citadel/code/modules/projectiles/boxes_magazines/external/pistol.dm
Vendored
+7 -7
View File
@@ -3,7 +3,7 @@
desc = "A gun magazine. Loaded with rounds which ignite the target.."
id = "10mminc"
build_type = PROTOLATHE
materials = list(MAT_PLASMA = 50000, MAT_METAL = 18000)
materials = list(/datum/material/plasma = 50000, /datum/material/iron = 18000)
reagents_list = list(/datum/reagent/toxin/plasma = 120, /datum/reagent/napalm = 240)
build_path = /obj/item/ammo_box/magazine/m10mm/fire
category = list("Weapons")
@@ -14,7 +14,7 @@
desc = "A gun magazine."
id = "10mm"
build_type = PROTOLATHE
materials = list(MAT_METAL = 55000)
materials = list(/datum/material/iron = 55000)
build_path = /obj/item/ammo_box/magazine/m10mm
category = list("Ammo")
departmental_flags = DEPARTMENTAL_FLAG_SECURITY
@@ -24,7 +24,7 @@
desc = "A gun magazine. Loaded with hollow-point rounds, extremely effective against unarmored targets, but nearly useless against protective clothing."
id = "10mmhp"
build_type = PROTOLATHE
materials = list(MAT_METAL = 40000, MAT_GLASS = 50000)
materials = list(/datum/material/iron = 40000, /datum/material/glass = 50000)
reagents_list = list(/datum/reagent/sonic_powder = 280)
build_path = /obj/item/ammo_box/magazine/m10mm/hp
category = list("Ammo")
@@ -35,7 +35,7 @@
desc = "A gun magazine. Loaded with rounds which penetrate armour, but are less effective against normal targets."
id = "10mmap"
build_type = PROTOLATHE
materials = list(MAT_METAL = 40000, MAT_TITANIUM = 60000)
materials = list(/datum/material/iron = 40000, /datum/material/titanium = 60000)
build_path = /obj/item/ammo_box/magazine/m10mm/ap
category = list("Ammo")
departmental_flags = DEPARTMENTAL_FLAG_SECURITY
@@ -45,7 +45,7 @@
desc = "A stripper clip used to quickly load bolt action rifles. Contains 5 rounds."
id = "bolt_clip"
build_type = PROTOLATHE
materials = list(MAT_METAL = 8000)
materials = list(/datum/material/iron = 8000)
build_path = /obj/item/ammo_box/a762
category = list("Ammo")
departmental_flags = DEPARTMENTAL_FLAG_SECURITY
@@ -54,7 +54,7 @@
name = "handgun magazine (.45)"
id = "m45"
build_type = PROTOLATHE
materials = list(MAT_METAL = 80000)
materials = list(/datum/material/iron = 80000)
build_path = /obj/item/ammo_box/magazine/m45
category = list("Ammo")
departmental_flags = DEPARTMENTAL_FLAG_SECURITY
@@ -64,7 +64,7 @@
desc = "A gun magazine."
id = "pistolm9mm"
build_type = PROTOLATHE
materials = list(MAT_METAL = 80000)
materials = list(/datum/material/iron = 80000)
build_path = /obj/item/ammo_box/magazine/pistolm9mm
category = list("Ammo")
departmental_flags = DEPARTMENTAL_FLAG_SECURITY
modular_citadel/code/modules/projectiles/guns/ballistic/magweapon.dm
+8 -8
View File
@@ -23,7 +23,7 @@
icon_state = "toy9magazine"
max_ammo = 30
multiple_sprites = 2
materials = list(MAT_METAL = 200)
custom_materials = list(/datum/material/iron = 200)
/obj/item/gun/ballistic/automatic/x9/toy
name = "\improper Foam Force X9"
@@ -132,7 +132,7 @@
desc = "A weapon which fires ferromagnetic slugs."
id = "magpisol"
build_type = PROTOLATHE
materials = list(MAT_METAL = 7500, MAT_GLASS = 1000, MAT_URANIUM = 1000, MAT_TITANIUM = 5000, MAT_SILVER = 2000)
materials = list(/datum/material/iron = 7500, /datum/material/glass = 1000, /datum/material/uranium = 1000, /datum/material/titanium = 5000, /datum/material/silver = 2000)
build_path = /obj/item/gun/ballistic/automatic/pistol/mag/nopin
category = list("Weapons")
departmental_flags = DEPARTMENTAL_FLAG_SECURITY
@@ -142,7 +142,7 @@
desc = "A 14 round magazine for the Magpistol."
id = "mag_magpistol"
build_type = PROTOLATHE
materials = list(MAT_METAL = 4000, MAT_SILVER = 500)
materials = list(/datum/material/iron = 4000, /datum/material/silver = 500)
build_path = /obj/item/ammo_box/magazine/mmag/small/lethal
category = list("Ammo")
departmental_flags = DEPARTMENTAL_FLAG_SECURITY
@@ -151,7 +151,7 @@
name = "Magpistol Magazine (Non-Lethal)"
desc = "A 14 round non-lethal magazine for the Magpistol."
id = "mag_magpistol_nl"
materials = list(MAT_METAL = 3000, MAT_SILVER = 250, MAT_TITANIUM = 250)
materials = list(/datum/material/iron = 3000, /datum/material/silver = 250, /datum/material/titanium = 250)
build_path = /obj/item/ammo_box/magazine/mmag/small
departmental_flags = DEPARTMENTAL_FLAG_SECURITY
@@ -289,7 +289,7 @@
desc = "An upscaled Magpistol in rifle form."
id = "magrifle"
build_type = PROTOLATHE
materials = list(MAT_METAL = 10000, MAT_GLASS = 2000, MAT_URANIUM = 2000, MAT_TITANIUM = 10000, MAT_SILVER = 4000, MAT_GOLD = 2000)
materials = list(/datum/material/iron = 10000, /datum/material/glass = 2000, /datum/material/uranium = 2000, /datum/material/titanium = 10000, /datum/material/silver = 4000, /datum/material/gold = 2000)
build_path = /obj/item/gun/ballistic/automatic/magrifle/nopin
category = list("Weapons")
departmental_flags = DEPARTMENTAL_FLAG_SECURITY
@@ -299,7 +299,7 @@
desc = "A 24-round magazine for the Magrifle."
id = "mag_magrifle"
build_type = PROTOLATHE
materials = list(MAT_METAL = 8000, MAT_SILVER = 1000)
materials = list(/datum/material/iron = 8000, /datum/material/silver = 1000)
build_path = /obj/item/ammo_box/magazine/mmag/lethal
category = list("Ammo")
departmental_flags = DEPARTMENTAL_FLAG_SECURITY
@@ -308,7 +308,7 @@
name = "Magrifle Magazine (Non-Lethal)"
desc = "A 24- round non-lethal magazine for the Magrifle."
id = "mag_magrifle_nl"
materials = list(MAT_METAL = 6000, MAT_SILVER = 500, MAT_TITANIUM = 500)
materials = list(/datum/material/iron = 6000, /datum/material/silver = 500, /datum/material/titanium = 500)
build_path = /obj/item/ammo_box/magazine/mmag
departmental_flags = DEPARTMENTAL_FLAG_SECURITY
@@ -321,7 +321,7 @@
max_ammo = 24
multiple_sprites = 2
ammo_type = /obj/item/ammo_casing/caseless/foam_dart/mag
materials = list(MAT_METAL = 200)
custom_materials = list(/datum/material/iron = 200)
/obj/item/gun/ballistic/automatic/magrifle/toy
name = "foamag rifle"
modular_citadel/code/modules/projectiles/guns/ballistic/magweapon_energy.dm
+6 -6
View File
@@ -88,7 +88,7 @@
desc = "An upscaled Magpistol in rifle form."
id = "magrifle_e"
build_type = PROTOLATHE
materials = list(MAT_METAL = 10000, MAT_GLASS = 2000, MAT_URANIUM = 2000, MAT_TITANIUM = 10000, MAT_SILVER = 4000, MAT_GOLD = 2000)
materials = list(/datum/material/iron = 10000, /datum/material/glass = 2000, /datum/material/uranium = 2000, /datum/material/titanium = 10000, /datum/material/silver = 4000, /datum/material/gold = 2000)
build_path = /obj/item/gun/ballistic/automatic/magrifle_e/nopin
category = list("Weapons")
departmental_flags = DEPARTMENTAL_FLAG_SECURITY
@@ -98,7 +98,7 @@
desc = "A 24-round magazine for the Magrifle."
id = "mag_magrifle_e"
build_type = PROTOLATHE
materials = list(MAT_METAL = 8000, MAT_SILVER = 1000)
materials = list(/datum/material/iron = 8000, /datum/material/silver = 1000)
build_path = /obj/item/ammo_box/magazine/mmag_e/lethal
category = list("Ammo")
departmental_flags = DEPARTMENTAL_FLAG_SECURITY
@@ -107,7 +107,7 @@
name = "Magrifle Magazine (Non-Lethal)"
desc = "A 24- round non-lethal magazine for the Magrifle."
id = "mag_magrifle_e_nl"
materials = list(MAT_METAL = 6000, MAT_SILVER = 500, MAT_TITANIUM = 500)
materials = list(/datum/material/iron = 6000, /datum/material/silver = 500, /datum/material/titanium = 500)
build_path = /obj/item/ammo_box/magazine/mmag_e
departmental_flags = DEPARTMENTAL_FLAG_SECURITY
@@ -116,7 +116,7 @@
desc = "A weapon which fires ferromagnetic slugs."
id = "magpistol_e"
build_type = PROTOLATHE
materials = list(MAT_METAL = 7500, MAT_GLASS = 1000, MAT_URANIUM = 1000, MAT_TITANIUM = 5000, MAT_SILVER = 2000)
materials = list(/datum/material/iron = 7500, /datum/material/glass = 1000, /datum/material/uranium = 1000, /datum/material/titanium = 5000, /datum/material/silver = 2000)
build_path = /obj/item/gun/ballistic/automatic/pistol/mag_e/nopin
category = list("Weapons")
departmental_flags = DEPARTMENTAL_FLAG_SECURITY
@@ -126,7 +126,7 @@
desc = "A 14 round magazine for the Magpistol."
id = "mag_magpistol_e"
build_type = PROTOLATHE
materials = list(MAT_METAL = 4000, MAT_SILVER = 500)
materials = list(/datum/material/iron = 4000, /datum/material/silver = 500)
build_path = /obj/item/ammo_box/magazine/mmag_e/small/lethal
category = list("Ammo")
departmental_flags = DEPARTMENTAL_FLAG_SECURITY
@@ -135,7 +135,7 @@
name = "Magpistol Magazine (Non-Lethal)"
desc = "A 14 round non-lethal magazine for the Magpistol."
id = "mag_magpistol_e_nl"
materials = list(MAT_METAL = 3000, MAT_SILVER = 250, MAT_TITANIUM = 250)
materials = list(/datum/material/iron = 3000, /datum/material/silver = 250, /datum/material/titanium = 250)
build_path = /obj/item/ammo_box/magazine/mmag_e/small
departmental_flags = DEPARTMENTAL_FLAG_SECURITY
modular_citadel/code/modules/projectiles/guns/ballistic/rifles.dm
+3 -3
View File
@@ -42,7 +42,7 @@
icon_state = "toy9magazine"
max_ammo = 30
multiple_sprites = 2
materials = list(MAT_METAL = 200)
custom_materials = list(/datum/material/iron = 200)
/obj/item/gun/ballistic/automatic/x9/toy
name = "\improper Foam Force X9"
@@ -178,7 +178,7 @@
icon_state = "AM4MAG-60"
max_ammo = 60
multiple_sprites = 0
materials = list(MAT_METAL = 200)
custom_materials = list(/datum/material/iron = 200)
/obj/item/gun/ballistic/automatic/AM4B
name = "AM4-B"
@@ -230,7 +230,7 @@
icon_state = "AM4MAG-32"
max_ammo = 32
multiple_sprites = 0
materials = list(MAT_METAL = 200)
custom_materials = list(/datum/material/iron = 200)
/obj/item/gun/ballistic/automatic/AM4C
name = "AM4-C"
modular_citadel/code/modules/projectiles/guns/toys.dm
+2 -2
View File
@@ -57,7 +57,7 @@
desc = "An authentic cap-firing reproduction of a F3 Justicar big-bore revolver! Pretend to blow your friend's brains out with this 100% safe toy! Satisfaction guaranteed!"
icon_state = "justicar"
icon = 'modular_citadel/icons/obj/guns/toys.dmi'
materials = list(MAT_METAL=2000, MAT_GLASS=250)
custom_materials = list(/datum/material/iron=2000, /datum/material/glass=250)
/obj/item/toy/gun/m41
@@ -65,4 +65,4 @@
desc = "A toy replica of the Corporate Mercenaries' standard issue rifle. For Avtomat is inscribed on the side."
icon_state = "toym41"
icon = 'modular_citadel/icons/obj/guns/toys.dmi'
materials = list(MAT_METAL=2000, MAT_GLASS=250)
custom_materials = list(/datum/material/iron=2000, /datum/material/glass=250)