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

Merge branch 'master' into fixes_compile

Browse Source
This commit is contained in:
alberyk
2022-02-04 14:22:38 -03:00
parent 3d4dfea299 e314a6ec9b
commit a61a4b7e2c
78 changed files with 1128 additions and 361 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/datums/outfits/event/outfit_megacorps.dm
+2 -2
View File
@@ -121,12 +121,12 @@
gloves = /obj/item/clothing/gloves/force
glasses = /obj/item/clothing/glasses/thermal
accessory_contents = list(/obj/item/gun/projectile/tanto = 1)
accessory_contents = list(/obj/item/gun/projectile/revolver = 1)
suit_store = /obj/item/gun/projectile/automatic/rifle/sol
backpack_contents = list(
/obj/item/ammo_magazine/mc10mm = 3,
/obj/item/ammo_magazine/a357 = 3,
/obj/item/ammo_magazine/c762/sol = 2
)
code/datums/outfits/outfit.dm
+6
View File
@@ -344,14 +344,20 @@
if(pda && !visualsOnly)
var/obj/item/I = new pda(H)
switch(H.pda_choice)
if(OUTFIT_TAB_PDA)
I.desc_fluff += "For its many years of service, this model has held a virtual monopoly for PDA models for NanoTrasen. The secret? A lapel pin affixed to the back."
if(OUTFIT_PDA_OLD)
I.icon = 'icons/obj/pda_old.dmi'
I.desc_fluff += "Nicknamed affectionately as the 'Brick', PDA enthusiasts rejoice with the return of an old favorite, retrofitted to new modular computing standards."
if(OUTFIT_PDA_RUGGED)
I.icon = 'icons/obj/pda_rugged.dmi'
I.desc_fluff += "EVA enthusiasts and owners of fat fingers just LOVE the huge tactile buttons provided by this model. Prone to butt-dialing, but don't let that hold you back."
if(OUTFIT_PDA_SLATE)
I.icon = 'icons/obj/pda_slate.dmi'
I.desc_fluff += "A bet between an engineer and a disgruntled scientist, it turns out you CAN make a PDA out of an atmospherics scanner. Also, probably don't tell management, just enjoy."
if(OUTFIT_PDA_SMART)
I.icon = 'icons/obj/pda_smart.dmi'
I.desc_fluff += "NanoTrasen originally designed this as a portable media player. Unfortunately, Royalty-free and corporate-approved ukulele isn't particularly popular."
I.update_icon()
if (H.pda_choice == OUTFIT_WRISTBOUND)
H.equip_or_collect(I, slot_wrists)
code/datums/trading/goods.dm
+1 -1
View File
@@ -39,7 +39,7 @@
/obj/item/board = TRADER_THIS_TYPE,
/obj/item/deck = TRADER_SUBTYPES_ONLY,
/obj/item/pack = TRADER_SUBTYPES_ONLY,
/obj/item/dice = TRADER_ALL,
/obj/item/stack/dice = TRADER_ALL,
/obj/item/eightball = TRADER_ALL,
/obj/item/gun/energy/wand/toy = TRADER_THIS_TYPE,
/obj/item/spirit_board = TRADER_ALL