cyberpresidentvanellope/Paradise
1
0
Fork 0
mirror of https://github.com/ParadiseSS13/Paradise.git synced 2026-07-10 14:44:05 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'master' of https://github.com/ParadiseSS13/Paradise into turfs

Browse Source 
# Conflicts:
#	icons/obj/vending.dmi
#	paradise.dme
This commit is contained in:
Mark van Alphen
2019-05-30 19:35:52 +02:00
parent ef479cb982 7d940885b9
commit b65fbb907e
90 changed files with 1054 additions and 1961 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/modules/projectiles/guns/projectile/sniper.dm
+16 -14
View File
@@ -1,6 +1,6 @@
/obj/item/gun/projectile/automatic/sniper_rifle
name = "sniper rifle"
desc = "the kind of gun that will leave you crying for mummy before you even realise your leg's missing"
desc = "The kind of gun that will leave you crying for mummy before you even realise your leg's missing."
icon_state = "sniper"
item_state = "sniper"
recoil = 2
@@ -20,25 +20,27 @@
slot_flags = SLOT_BACK
actions_types = list()
/obj/item/gun/projectile/automatic/sniper_rifle/syndicate
name = "syndicate sniper rifle"
desc = "Syndicate flavoured sniper rifle, it packs quite a punch, a punch to your face."
origin_tech = "combat=7;syndicate=6"
/obj/item/gun/projectile/automatic/sniper_rifle/syndicate/penetrator
name = "syndicate penetrator sniper rifle"
/obj/item/gun/projectile/automatic/sniper_rifle/syndicate/penetrator/Initialize(mapload)
. = ..()
desc += " It comes loaded with a penetrator magazine, but can use different magazines."
QDEL_NULL(magazine)
magazine = new /obj/item/ammo_box/magazine/sniper_rounds/penetrator(src)
/obj/item/gun/projectile/automatic/sniper_rifle/update_icon()
if(magazine)
icon_state = "sniper-mag"
else
icon_state = "sniper"
/obj/item/gun/projectile/automatic/sniper_rifle/syndicate
name = "syndicate sniper rifle"
desc = "Syndicate flavoured sniper rifle, it packs quite a punch, a punch to your face"
origin_tech = "combat=7;syndicate=6"
/obj/item/gun/projectile/automatic/sniper_rifle/soporific
name = "Soporific sniper rifle"
desc = "A sniper rifle that's primarily used to fire non-lethal soporific rounds."
origin_tech = "combat=7;syndicate=6"
mag_type = /obj/item/ammo_box/magazine/sniper_rounds/soporific
can_unsuppress = 0
can_suppress = 0
/obj/item/gun/projectile/automatic/sniper_rifle/compact //holds very little ammo, lacks zooming, and bullets are primarily damage dealers, but the gun lacks the downsides of the full size rifle
name = "compact sniper rifle"
desc = "a compact, unscoped version of the standard issue syndicate sniper rifle. Still capable of sending people crying."