Fixes ert merc outfit (#7285)

This commit is contained in:
Matt Atlas
2019-10-27 22:00:22 +01:00
committed by Erki
parent a9e34855c2
commit 62feca073d
3 changed files with 48 additions and 1 deletions
+3 -1
View File
@@ -140,11 +140,13 @@
/datum/outfit/admin/ert/mercenary/leader
name = "Mercenary Freelancer Leader"
l_hand = /obj/item/weapon/gun/projectile/automatic/rifle
back = /obj/item/weapon/rig/merc
back = /obj/item/weapon/rig/merc/distress
suit_store = null
suit = null
head = null
backpack_contents = list()
belt_contents = list(
/obj/item/ammo_magazine/c762 = 3,
/obj/item/weapon/handcuffs/ziptie = 2,
@@ -40,3 +40,6 @@
/obj/item/rig_module/electrowarfare_suite, //might as well
/obj/item/rig_module/actuators/combat // What the dude above me said.
)
/obj/item/weapon/rig/merc/distress
req_access = list(access_distress)
+42
View File
@@ -0,0 +1,42 @@
################################
# Example Changelog File
#
# Note: This file, and files beginning with ".", and files that don't end in ".yml" will not be read. If you change this file, you will look really dumb.
#
# Your changelog will be merged with a master changelog. (New stuff added only, and only on the date entry for the day it was merged.)
# When it is, any changes listed below will disappear.
#
# Valid Prefixes:
# bugfix
# wip (For works in progress)
# tweak
# soundadd
# sounddel
# rscadd (general adding of nice things)
# rscdel (general deleting of nice things)
# imageadd
# imagedel
# maptweak
# spellcheck (typo fixes)
# experiment
# balance
# admin
# backend
# security
# refactor
#################################
# Your name.
author: MattAtlas
# Optional: Remove this file after generating master changelog. Useful for PR changelogs that won't get used again.
delete-after: True
# Any changes you've made. See valid prefix list above.
# INDENT WITH TWO SPACES. NOT TABS. SPACES.
# SCREW THIS UP AND IT WON'T WORK.
# Also, all entries are changed into a single [] after a master changelog generation. Just remove the brackets when you add new entries.
# Please surround your changes in double quotes ("), as certain characters otherwise screws up compiling. The quotes will not show up in the changelog.
changes:
- bugfix: "Merc leaders can now actually use the hardsuit."
- rscdel: "Merc leaders no longer spawn with items they shouldn't have."