cyberpresidentvanellope/Aurora.3
1
0
Fork 0
mirror of https://github.com/Aurorastation/Aurora.3.git synced 2026-02-09 07:59:57 +00:00
Code Issues Packages Projects Releases Wiki Activity

Reworks NanoTrasen medals (#9889)

Browse Source
This commit is contained in:
Alberyk
2020-09-08 15:42:47 -03:00
committed by GitHub
parent 42b7f7531f
commit e089338105
11 changed files with 117 additions and 126 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
aurorastation.dme
View File

@@ -1447,6 +1447,7 @@
#include "code\modules\clothing\under\accessories\badges.dm"
#include "code\modules\clothing\under\accessories\holster.dm"
#include "code\modules\clothing\under\accessories\lockets.dm"
#include "code\modules\clothing\under\accessories\medal.dm"
#include "code\modules\clothing\under\accessories\shirts.dm"
#include "code\modules\clothing\under\accessories\storage.dm"
#include "code\modules\clothing\under\accessories\xeno\tajara.dm"

3
code/datums/outfits/event/outfit_nanotrasen.dm
View File

@@ -93,8 +93,7 @@
backpack_contents = list(
/obj/item/storage/box/fancy/cigarettes/cigar = 1,
/obj/item/flame/lighter/zippo = 1,
/obj/item/clothing/accessory/medal/gold/heroism = 1
/obj/item/flame/lighter/zippo = 1
)
implants = list(

4
code/game/objects/items/weapons/gift_wrappaper.dm
View File

@@ -206,10 +206,6 @@
/obj/item/xmasgift/medium,
/obj/item/toy/syndicateballoon,
/obj/item/toy/xmastree,
/obj/item/clothing/accessory/medal/gold/heroism,
/obj/item/clothing/accessory/medal/nobel_science,
/obj/item/clothing/accessory/medal/bronze_heart,
/obj/item/clothing/accessory/medal/silver/valor,
/obj/item/bluespace_crystal,
/obj/item/gun/energy/mousegun,
/obj/item/gun/energy/wand/toy,

8
code/game/objects/items/weapons/storage/lockbox.dm
View File

@@ -114,11 +114,3 @@
icon_locked = "medalbox+l"
icon_closed = "medalbox"
icon_broken = "medalbox+b"
starts_with = list(
/obj/item/clothing/accessory/medal/conduct = 3,
/obj/item/clothing/accessory/medal/bronze_heart = 2,
/obj/item/clothing/accessory/medal/nobel_science = 2,
/obj/item/clothing/accessory/medal/iron/merit = 2,
/obj/item/clothing/accessory/medal/silver/valor = 1,
/obj/item/clothing/accessory/medal/silver/security = 2
)

110
code/modules/clothing/under/accessories/accessory.dm
View File

@@ -200,116 +200,6 @@
drop_sound = 'sound/items/drop/accessory.ogg'
pickup_sound = 'sound/items/pickup/accessory.ogg'
//Medals
/obj/item/clothing/accessory/medal
name = "bronze medal"
desc = "A bronze medal."
icon_state = "bronze"
overlay_state = "bronze"
flippable = 1
drop_sound = 'sound/items/drop/accessory.ogg'
pickup_sound = 'sound/items/pickup/accessory.ogg'
/obj/item/clothing/accessory/medal/conduct
name = "distinguished conduct medal"
desc = "A bronze medal awarded for distinguished conduct. Whilst a great honor, this is most basic award on offer. It is often awarded by a captain to a member of their crew."
icon_state = "bronze_nt"
/obj/item/clothing/accessory/medal/bronze_heart
name = "bronze heart medal"
desc = "A bronze heart-shaped medal awarded for sacrifice. It is often awarded posthumously or for severe injury in the line of duty."
icon_state = "bronze_heart"
/obj/item/clothing/accessory/medal/nobel_science
name = "\improper Nobel science award"
desc = "A bronze medal which represents significant contributions to the field of science or engineering."
/obj/item/clothing/accessory/medal/sol
name = "\improper ASSN medal of bravery"
desc = "A bronze medal dedicated to those who have demonstrated courageous acts in the name of the Alliance of Sovereign Solarian Nations."
icon_state = "bronze_sol"
/obj/item/clothing/accessory/medal/iron
name = "iron medal"
desc = "A simple iron medal."
icon_state = "iron"
overlay_state = "iron"
/obj/item/clothing/accessory/medal/iron/merit
name = "iron merit medal"
desc = "An iron medal awarded to NanoTrasen employees for merit."
icon_state = "iron_nt"
/obj/item/clothing/accessory/medal/iron/star
name = "iron star medal"
desc = "An iron medal awarded to those who have provided service to their profession in the field of medical organisation, and/or to physicians by enhancing overall health and well-being of colleagues on both personal and professional levels."
icon_state = "iron_star"
overlay_state = "iron_star"
/obj/item/clothing/accessory/medal/iron/sol
name = "\improper ASSN medal of effort"
desc = "An iron medal awarded for distinguished effort conducted by an individual in the name of the Alliance of Sovereign Solarion Nations."
icon_state = "iron_sol"
/obj/item/clothing/accessory/medal/silver
name = "silver medal"
desc = "A silver medal."
icon_state = "silver"
overlay_state = "silver"
/obj/item/clothing/accessory/medal/silver/valor
name = "medal of valor"
desc = "A silver medal awarded for acts of exceptional valor."
icon_state = "silver_sword"
/obj/item/clothing/accessory/medal/silver/security
name = "robust security award"
desc = "An award for distinguished combat and sacrifice in defence of corporate commercial interests. Often awarded to security staff."
icon_state = "silver_nt"
/obj/item/clothing/accessory/medal/silver/sol
name = "\improper ASSN medal of service"
desc = "A silver medal held for those who have served for long periods of time with pristine conduct in the name of the Alliance of Sovereign Solarian Nations."
icon_state = "silver_sol"
/obj/item/clothing/accessory/medal/gold
name = "gold medal"
desc = "A prestigious golden medal."
icon_state = "gold"
overlay_state = "gold"
/obj/item/clothing/accessory/medal/gold/star
name = "gold star medal"
desc = "Some sort of medal with finely-cut gold. There is a small arch depicted on it."
icon_state = "gold_star"
/obj/item/clothing/accessory/medal/gold/sun
name = "gold sun medal"
desc = "A finely rounded gold medal with small, complicated engravings running all around it."
icon_state = "gold_sun"
/obj/item/clothing/accessory/medal/gold/captain
name = "medal of captaincy"
desc = "A golden medal awarded exclusively to those promoted to the rank of captain. It signifies the codified responsibilities of a captain, and their undisputable authority over their crew."
icon_state = "gold_nt"
/obj/item/clothing/accessory/medal/gold/heroism
name = "medal of exceptional heroism"
desc = "An extremely rare golden medal awarded only by company officials. To receive such a medal is the highest honor and as such, very few exist. This medal is almost never awarded to anybody but commanders."
icon_state = "gold_crest"
/obj/item/clothing/accessory/medal/gold/sol
name = "\improper ASSN medal of distinction"
desc = "A gold medal reserved only for those with excellent performance in both combat and political training, for selflessness, and for bravery displayed in service under the Alliance of Sovereign Solarian Nations."
icon_state = "gold_sol"
/obj/item/clothing/accessory/medal/white_heart
name = "distinguished volunteer's medal"
desc = "A white medal with a red cross on it for those who have performed outstanding medical services as a volunteer for the Interstellar Aid Corps."
icon_state = "white_heart"
overlay_state = "white_heart"
/obj/item/clothing/accessory/suspenders
name = "suspenders"
desc = "They suspend the illusion of the mime's play."

109
code/modules/clothing/under/accessories/medal.dm Normal file
View File

@@ -0,0 +1,109 @@
/obj/item/clothing/accessory/medal
name = "bronze medal"
desc = "A bronze medal."
icon_state = "bronze"
overlay_state = "bronze"
flippable = TRUE
drop_sound = 'sound/items/drop/accessory.ogg'
pickup_sound = 'sound/items/pickup/accessory.ogg'
/obj/item/clothing/accessory/medal/sol
name = "\improper ASSN medal of bravery"
desc = "A bronze medal dedicated to those who have demonstrated courageous acts in the name of the Alliance of Sovereign Solarian Nations."
icon_state = "bronze_sol"
/obj/item/clothing/accessory/medal/white_heart
name = "distinguished volunteer's medal"
desc = "A white medal with a red cross on it for those who have performed outstanding medical services as a volunteer for the Interstellar Aid Corps."
icon_state = "white_heart"
overlay_state = "white_heart"
/obj/item/clothing/accessory/medal/corporate
name = "corporate medal"
desc = "A bronze medal awarded to a member of crew for distinguished conduct. Engraved on the front is the letter N, while the back sports the date and recipient."
icon_state = "corporate_medal"
overlay_state = "corporate_medal"
/obj/item/clothing/accessory/medal/merit
name = "award for merit"
desc = "A award for merit, 2nd class given to a member of the crew for meritorious action in defence of life, limb or property. It is a serifed letter N on the front of which the \
words \"for merit\" are engraved in silver, with the date and recipient on the back."
icon_state = "merit2"
overlay_state = "merit2"
/obj/item/clothing/accessory/medal/wound_ribbon
name = "wound ribbon"
desc = "A purple and black ribbon denoting first time significant injuries in service to the corporation."
icon_state = "wound_ribbon"
overlay_state = "wound_ribbon"
/obj/item/clothing/accessory/medal/wound
name = "wound medal"
desc = "An obsidian coloured, teardrop-shaped medal with an artificial purple shine awarded for repeated serious injuries, loss of limb or death in service of the corporation. Engraved on the back are the name of the recipient and the date."
icon_state = "wound_medal"
overlay_state = "wound_medal"
flippable = FALSE
/obj/item/clothing/accessory/medal/iron
name = "iron medal"
desc = "A simple iron medal."
icon_state = "iron"
overlay_state = "iron"
/obj/item/clothing/accessory/medal/iron/sol
name = "\improper ASSN medal of effort"
desc = "An iron medal awarded for distinguished effort conducted by an individual in the name of the Alliance of Sovereign Solarian Nations."
icon_state = "iron_sol"
/obj/item/clothing/accessory/medal/silver
name = "silver medal"
desc = "A silver medal."
icon_state = "silver"
overlay_state = "silver"
/obj/item/clothing/accessory/medal/silver/sol
name = "\improper ASSN medal of service"
desc = "A silver medal held for those who have served for long periods of time with pristine conduct in the name of the Alliance of Sovereign Solarian Nations."
icon_state = "silver_sol"
/obj/item/clothing/accessory/medal/silver/merit
name = "award for merit"
desc = "A award for merit, 1nd class given to a member of the crew for meritorious action in defence of life, limb or property. It is a serifed letter N on the front of which the \
words \"for merit\" are engraved in gold, with the date and recipient on the back."
icon_state = "merit1"
overlay_state = "merit1"
/obj/item/clothing/accessory/medal/silver/science
name = "silver sciences award"
desc = "A silver medal which represents significant contributions to the field of science or engineering. Engraved on the front side is a laboratory flask, with the name of the recipient and date on the back."
icon_state = "silversci"
overlay_state = "silversci"
/obj/item/clothing/accessory/medal/gold
name = "gold medal"
desc = "A prestigious golden medal."
icon_state = "gold"
overlay_state = "gold"
/obj/item/clothing/accessory/medal/gold/captain
name = "medal of captaincy"
desc = "A golden medal awarded exclusively to those promoted to the rank of captain. It signifies the codified responsibilities of a captain, and their undisputable authority over their crew."
icon_state = "gold_nt"
/obj/item/clothing/accessory/medal/gold/sol
name = "\improper ASSN medal of distinction"
desc = "A gold medal reserved only for those with excellent performance in both combat and political training, for selflessness, and for bravery displayed in service under the Alliance of Sovereign Solarian Nations."
icon_state = "gold_sol"
/obj/item/clothing/accessory/medal/gold/science
name = "gold sciences award"
desc = "A silver medal which represents significant contributions to the field of science or engineering. Engraved on the front side is a laboratory flask, with the name of the recipient and date on the back."
icon_state = "goldsci"
overlay_state = "goldsci"
/obj/item/clothing/accessory/medal/gold/miranda
name = "miranda cross"
desc = "The highest honour Nanotrasen can bestow upon an employee, the Miranda Cross is a golden, cross shaped medal encrusted with a small blue sapphire in the middle. On the back, the name of the recipient and the date are engraved."
icon_state = "miranda_cross"
overlay_state = "miranda_cross"

1
code/modules/item_worth/worths_list.dm
View File

@@ -560,7 +560,6 @@ var/list/worths = list(
/obj/item/clothing/accessory/storage/bayonet = 250,
/obj/item/clothing/accessory/storage = 55,
/obj/item/clothing/accessory/stethoscope = 70,
/obj/item/clothing/accessory/medal/gold/heroism = 1000,
/obj/item/clothing/accessory/medal/gold/captain = 800,
/obj/item/clothing/accessory/medal/gold = 600,
/obj/item/clothing/accessory/medal/silver = 300,

6
html/changelogs/alberyk-newmedal.yml Normal file
View File

@@ -0,0 +1,6 @@
author: Alberyk, Thelancer
delete-after: True
changes:
- rscadd: "Reworked NanoTrasen medals and awards."

BIN
icons/mob/ties.dmi
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 76 KiB

After

Width:  |  Height:  |  Size: 78 KiB

BIN
icons/obj/clothing/ties.dmi
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 59 KiB

After

Width:  |  Height:  |  Size: 61 KiB

1
maps/aurora/aurora-4_mainlevel.dmm
View File

@@ -24373,7 +24373,6 @@
/area/crew_quarters/captain)
"aPY" = (
/obj/structure/table/wood,
/obj/item/storage/lockbox/medal,
/obj/structure/cable/green{
d1 = 4;
d2 = 8;