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

Merge remote-tracking branch 'citadel/master' into mobility_flags

Browse Source
This commit is contained in:
kevinz000
2020-02-21 23:29:25 -07:00
parent b8d60a33bd d4e1c30597
commit f6542b381c
279 changed files with 4174 additions and 1928 deletions
Download Patch File Download Diff File Expand all files Collapse all files
modular_citadel/code/modules/projectiles/boxes_magazines/external/pistol.dm
Vendored
+9 -9
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
@@ -74,7 +74,7 @@
desc = "A revolver speedloader."
id = "sl357"
build_type = PROTOLATHE
materials = list(MAT_METAL = 30000)
materials = list(/datum/material/iron = 30000)
build_path = /obj/item/ammo_box/a357
category = list("Ammo")
departmental_flags = DEPARTMENTAL_FLAG_SECURITY
@@ -84,7 +84,7 @@
desc = "A revolver speedloader. Cuts through like a hot knife through butter."
id = "sl357ap"
build_type = PROTOLATHE
materials = list(MAT_METAL = 30000, MAT_TITANIUM = 45000)
materials = list(/datum/material/iron = 30000, /datum/material/titanium = 45000)
build_path = /obj/item/ammo_box/a357/ap
category = list("Ammo")
departmental_flags = DEPARTMENTAL_FLAG_SECURITY
modular_citadel/code/modules/projectiles/guns/ballistic/rifles.dm
+4 -4
View File
@@ -24,7 +24,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"
@@ -65,7 +65,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"
@@ -201,7 +201,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"
@@ -253,7 +253,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)