cyberpresidentvanellope/Paradise
1
0
Fork 0
mirror of https://github.com/ParadiseSS13/Paradise.git synced 2026-07-12 23:53:47 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #3149 from DaveTheHeadcrab/friendlyfire

Browse Source 
Adds Fun
This commit is contained in:
Fox McCloud
2016-01-08 15:13:24 -05:00
parent 7b5e3fb110 96f7f48f32
commit efbe361853
5 changed files with 46 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/modules/admin/verbs/striketeam_syndicate.dm
+3 -2
View File
@@ -144,7 +144,8 @@ var/global/sent_syndicate_strike_team = 0
equip_to_slot_or_del(new /obj/item/clothing/glasses/thermal(src), slot_glasses)
equip_to_slot_or_del(new /obj/item/weapon/storage/backpack/security(src), slot_back)
equip_to_slot_or_del(new /obj/item/ammo_box/magazine/m762, slot_in_backpack)
equip_to_slot_or_del(new /obj/item/ammo_box/magazine/m762/buckshot, slot_in_backpack)
equip_to_slot_or_del(new /obj/item/ammo_box/magazine/m762/he, slot_in_backpack)
equip_to_slot_or_del(new /obj/item/ammo_box/magazine/m45(src), slot_in_backpack)
equip_to_slot_or_del(new /obj/item/weapon/reagent_containers/hypospray/combat/nanites(src), slot_in_backpack)
@@ -162,7 +163,7 @@ var/global/sent_syndicate_strike_team = 0
equip_to_slot_or_del(new /obj/item/weapon/tank/emergency_oxygen/double/full(src), slot_s_store)
equip_to_slot_or_del(new /obj/item/weapon/gun/projectile/automatic/pistol/m2411(src), slot_belt)
equip_to_slot_or_del(new /obj/item/weapon/gun/projectile/automatic/l6_saw(src), slot_r_hand)
equip_to_slot_or_del(new /obj/item/weapon/gun/projectile/automatic/l6_saw/devastator(src), slot_r_hand)
var/obj/item/weapon/card/id/syndicate/W = new(src) //Untrackable by AI
W.name = "[real_name]'s ID Card"
code/modules/projectiles/ammunition/magazines.dm
+23
View File
@@ -234,6 +234,29 @@
..()
icon_state = "[initial(icon_state)]-[round(ammo_count(),10)]"
/obj/item/ammo_box/magazine/m762/buckshot
name = "box magazine (buckshot)"
icon_state = "b762"
caliber = "shotgun"
ammo_type ="/obj/item/ammo_casing/shotgun/buckshot"
max_ammo = 300 // Bluespace!
/obj/item/ammo_box/magazine/m762/buckshot/update_icon()
..()
icon_state = "[initial(icon_state)]-[round(ammo_count(),60)]"
/obj/item/ammo_box/magazine/m762/he // I am not a good person.
name = "box magazine (40mm high explosive)"
icon_state = "g762"
caliber = "40mm"
ammo_type ="/obj/item/ammo_casing/a40mm"
max_ammo = 25
/obj/item/ammo_box/magazine/m762/he/update_icon()
..()
icon_state = "[initial(icon_state)]-[round(ammo_count(),5)]"
/obj/item/ammo_box/magazine/m12g
name = "shotgun magazine (12g slugs)"
icon_state = "m12gb"
code/modules/projectiles/guns/projectile/automatic.dm
+11
View File
@@ -148,6 +148,8 @@
update_icon()
/obj/item/weapon/gun/projectile/automatic/l6_saw/update_icon()
if(magazine && magazine.caliber != "a762")
icon_state = "l6[cover_open ? "open" : "closed"]0"
icon_state = "l6[cover_open ? "open" : "closed"][magazine ? round(magazine.ammo_count() * 2, 25) : "-empty"]"
/obj/item/weapon/gun/projectile/automatic/l6_saw/afterattack(atom/target as mob|obj|turf, mob/living/user as mob|obj, flag, params) //what I tried to do here is just add a check to see if the cover is open or not and add an icon_state change because I can't figure out how c-20rs do it with overlays
@@ -179,6 +181,15 @@
return
..()
/obj/item/weapon/gun/projectile/automatic/l6_saw/devastator
name = "\improper 'Devastator' LMG"
desc = "A heavily modified L6 SAW designed to chamber wide rounds. Commonly used by elite Syndicate boarding teams "
mag_type = "/obj/item/ammo_box/magazine/m762/buckshot"
/obj/item/weapon/gun/projectile/automatic/l6_saw/devastator/New()
..()
mag_type = "/obj/item/ammo_box/magazine/m762" // Workaround so it spawns with a shotgun mag loaded, but can still load regular LMG mags.
/obj/item/weapon/gun/projectile/automatic/m90
name = "\improper M-90gl Carbine"
desc = "A three-round burst 5.56 toploading carbine, designated 'M-90gl'. Has an attached underbarrel grenade launcher which can be toggled on and off."