cyberpresidentvanellope/Aurora.3
1
0
Fork 0
mirror of https://github.com/Aurorastation/Aurora.3.git synced 2026-01-02 05:22:40 +00:00
Code Issues Packages Projects Releases Wiki Activity

Warlord stuff fixes (#14394)

Browse Source
This commit is contained in:
TheDanseMacabre
2022-07-05 08:03:40 -04:00
committed by GitHub
parent 6de2d9f051
commit dda516428d
3 changed files with 45 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
code/game/objects/items/devices/modkit.dm
View File

@@ -171,7 +171,7 @@
w_class = ITEMSIZE_SMALL
suit_options = list(
/obj/item/clothing/head/helmet/space/void/sol = /obj/item/clothing/head/helmet/space/void/sol/srf,
/obj/item/clothing/suit/space/void/sol = /obj/item/clothing/head/helmet/space/void/sol/srf
/obj/item/clothing/suit/space/void/sol = /obj/item/clothing/suit/space/void/sol/srf
)
/obj/item/voidsuit_modkit/league

9
code/modules/clothing/spacesuits/void/misc.dm
View File

@@ -840,8 +840,7 @@
/obj/item/clothing/head/helmet/space/void/sol/ssmd
name = "military district voidsuit helmet"
desc = "A midweight Zavodskoi-manufactured voidsuit designed for the Solarian Armed Forces, the Type-4 \"Gargoyle\" is the primary armored voidsuit in use by the Alliance military. This one has been repainted by the forces of the Southern Solarian Military District to make it more easily identifiable \
from other forces using the Type-4, warlord or not."
desc = "A sleek and waspish composite-armored voidsuit helmet, issued to the personnel of the Sol Alliance's military. This one has been modified by the forces of the Southern Solarian Military District to make it more easily identifiable from other forces using the Type-4, warlord or not."
icon = 'icons/obj/contained_items/voidsuits/warlordsuit.dmi'
icon_state = "ssmd_helmet"
item_state = "ssmd_helmet"
@@ -858,8 +857,7 @@
/obj/item/clothing/head/helmet/space/void/sol/spg
name = "provisional government voidsuit helmet"
desc = "A midweight Zavodskoi-manufactured voidsuit designed for the Solarian Armed Forces, the Type-4 \"Gargoyle\" is the primary armored voidsuit in use by the Alliance military. This one has been repainted by the forces of the Solarian Provisional Government to make it more easily identifiable \
from other forces using the Type-4, warlord or not."
desc = "A sleek and waspish composite-armored voidsuit helmet, issued to the personnel of the Sol Alliance's military. This one has been modified by the forces of the Solarian Provisional Government to make it more easily identifiable from other forces using the Type-4, warlord or not."
icon = 'icons/obj/contained_items/voidsuits/warlordsuit.dmi'
icon_state = "spg_helmet"
item_state = "spg_helmet"
@@ -876,8 +874,7 @@
/obj/item/clothing/head/helmet/space/void/sol/mrsp
name = "shield pact voidsuit helmet"
desc = "A midweight Zavodskoi-manufactured voidsuit designed for the Solarian Armed Forces, the Type-4 \"Gargoyle\" is the primary armored voidsuit in use by the Alliance military. This one has been repainted by the scant forces of the Middle Ring Shield Pact to make it more easily identifiable \
from other forces using the Type-4, warlord or not."
desc = "A sleek and waspish composite-armored voidsuit helmet, issued to the personnel of the Sol Alliance's military. This one has been modified by the forces of the Middle Ring Shield Pact to make it more easily identifiable from other forces using the Type-4, warlord or not."
icon = 'icons/obj/contained_items/voidsuits/warlordsuit.dmi'
icon_state = "mrsp_helmet"
item_state = "mrsp_helmet"

41
html/changelogs/dansemacabre-warlord.yml Normal file
View File

@@ -0,0 +1,41 @@
################################
# 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: TheDanseMacabre
# 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: "Fixed helmet descriptions for a few warlord helmets. Also made it so the SRF modkit will not turn the armor into a helmet."