cyberpresidentvanellope/VOREStation
1
0
Fork 0
mirror of https://github.com/VOREStation/VOREStation.git synced 2026-07-19 11:05:50 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge polaris sync 01 17 2018

Browse Source 
Planes, layers, human/update_icon()
This commit is contained in:
Arokha Sieyes
2018-01-17 17:11:58 -05:00
committed by Leshana
parent f1e5343140 6fb1b66ced
commit ff228754b3
277 changed files with 20347 additions and 2214 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/modules/random_map/drop/drop_types.dm
+3 -3
View File
@@ -42,7 +42,7 @@ var/global/list/datum/supply_drop_loot/supply_drop
/obj/item/weapon/gun/energy/xray,
/obj/item/weapon/storage/box/emps,
/obj/item/weapon/storage/box/flashbangs,
/obj/item/weapon/material/hatchet/tacknife/combatknife)
/obj/item/weapon/material/knife/tacknife/combatknife)
/datum/supply_drop_loot/ballistics
name = "Ballistic Warfare"
@@ -66,7 +66,7 @@ var/global/list/datum/supply_drop_loot/supply_drop
/obj/item/ammo_magazine/m762/ap,
/obj/item/weapon/gun/projectile/colt,
/obj/item/ammo_magazine/m45,
/obj/item/weapon/material/hatchet/tacknife/combatknife)
/obj/item/weapon/material/knife/tacknife/combatknife)
/datum/supply_drop_loot/heavy_warfare
name = "Heavy Warfare"
@@ -94,7 +94,7 @@ var/global/list/datum/supply_drop_loot/supply_drop
/obj/item/weapon/grenade/flashbang,
/obj/item/weapon/grenade/empgrenade,
/obj/item/weapon/grenade/empgrenade,
/obj/item/weapon/material/hatchet/tacknife/combatknife)
/obj/item/weapon/material/knife/tacknife/combatknife)
datum/supply_drop_loot/riot
name = "Riot Gear"