Some disorganizes changes by Aces

- UNSC is now USDF.
- .32 is now .380 instead.
- Added giskard to random gun spawns.
- Changed oliva to be a subtype of giskard.
- Rebalanced random gun spawner and added things.
- Detective no longer spawns with a pistol. It's in your locker instead.
- `SMG_sol` is now just `sol`.
- Fixed some ammo pathing to be consistent.
- Moves Asset Protection spawn point inside the big armory at CentCom.
- Adds a door in CentCom to let the ERT area actually be reached from
CentCom's bridge.
This commit is contained in:
Spades
2017-09-21 03:22:20 -04:00
parent 2bafa74d90
commit 07762f31e7
20 changed files with 297 additions and 15795 deletions

View File

@@ -418,8 +418,8 @@
"nanotrasen representative",
"nanotrasen officer",
"nanotrasen captain",
"UNSC marine",
"UNSC officer",
"USDF marine",
"USDF officer",
"SolGov Representative",
"Imperial soldier",
"Imperial officer"
@@ -788,28 +788,28 @@
W.assignment = "Admiral"
W.registered_name = M.real_name
M.equip_to_slot_or_del(W, slot_wear_id)
if("UNSC marine")
M.equip_to_slot_or_del(new /obj/item/clothing/head/helmet/combat/unsc(M), slot_head)
if("USDF marine")
M.equip_to_slot_or_del(new /obj/item/clothing/head/helmet/combat/USDF(M), slot_head)
M.equip_to_slot_or_del(new /obj/item/clothing/shoes/boots/jackboots(M), slot_shoes)
M.equip_to_slot_or_del(new /obj/item/clothing/gloves/combat(M), slot_gloves)
M.equip_to_slot_or_del(new /obj/item/device/radio/headset/centcom(M), slot_l_ear)
M.equip_to_slot_or_del(new /obj/item/clothing/under/utility/marine/green(M), slot_w_uniform)
M.equip_to_slot_or_del(new /obj/item/clothing/suit/armor/combat/unsc(M), slot_wear_suit)
M.equip_to_slot_or_del(new /obj/item/clothing/suit/armor/combat/USDF(M), slot_wear_suit)
M.equip_to_slot_or_del(new /obj/item/weapon/gun/projectile/automatic/battlerifle(M), slot_back)
M.equip_to_slot_or_del(new /obj/item/weapon/storage/belt/security/tactical(M), slot_belt)
M.equip_to_slot_or_del(new /obj/item/ammo_magazine/battlerifle(M), slot_l_store)
M.equip_to_slot_or_del(new /obj/item/ammo_magazine/battlerifle(M), slot_r_store)
M.equip_to_slot_or_del(new /obj/item/ammo_magazine/battlerifle(M), slot_r_hand)
M.equip_to_slot_or_del(new /obj/item/ammo_magazine/battlerifle(M), slot_l_hand)
M.equip_to_slot_or_del(new /obj/item/ammo_magazine/m95(M), slot_l_store)
M.equip_to_slot_or_del(new /obj/item/ammo_magazine/m95(M), slot_r_store)
M.equip_to_slot_or_del(new /obj/item/ammo_magazine/m95(M), slot_r_hand)
M.equip_to_slot_or_del(new /obj/item/ammo_magazine/m95(M), slot_l_hand)
var/obj/item/weapon/card/id/W = new(M)
W.name = "[M.real_name]'s military ID Card"
W.icon_state = "lifetime"
W.access = get_all_station_access()
W.access += get_all_centcom_access()
W.assignment = "UNSC"
W.assignment = "USDF"
W.registered_name = M.real_name
M.equip_to_slot_or_del(W, slot_wear_id)
if("UNSC officer")
if("USDF officer")
M.equip_to_slot_or_del(new /obj/item/clothing/head/dress/marine/command/admiral(M), slot_head)
M.equip_to_slot_or_del(new /obj/item/clothing/shoes/boots/jackboots(M), slot_shoes)
M.equip_to_slot_or_del(new /obj/item/device/radio/headset/centcom(M), slot_l_ear)
@@ -825,7 +825,7 @@
W.icon_state = "lifetime"
W.access = get_all_station_access()
W.access += get_all_centcom_access()
W.assignment = "UNSC"
W.assignment = "USDF"
W.registered_name = M.real_name
M.equip_to_slot_or_del(W, slot_wear_id)
if("SolGov Representative")