3140bcf8a2
Fix commlink being in loadout
2018-01-25 16:42:56 -05:00
9016ca94c0
Merge branch 'master' of https://github.com/PolarisSS13/Polaris into aro-sync01222018
...
# Conflicts:
# code/modules/mob/mob.dm - Whitespace? No real conflict.
# code/modules/mob/mob_planes.dm - Comment conflict, was a late port to Polaris.
2018-01-22 12:10:19 -05:00
bfeda4c28b
properly names the communicator watch selector ( #4601 )
2018-01-20 21:32:44 -08:00
3c3dac7102
Merge branch 'master' of https://github.com/PolarisSS13/Polaris into polaris-sync-2018-01-19
...
# Conflicts:
# code/_onclick/hud/hud.dm
# code/modules/clothing/glasses/glasses.dm
# code/modules/mob/living/carbon/human/update_icons.dm
# maps/southern_cross/southern_cross-1.dmm
# maps/southern_cross/southern_cross-3.dmm
# maps/southern_cross/southern_cross-6.dmm
# vorestation.dme
2018-01-19 17:52:25 -05:00
c44af58716
Adds communicator watch (take 2) ( #4406 )
...
* adds communicator watch
* adds commwatch to a loadout selection list
* adds changelog
just in case
2018-01-17 19:33:32 -06:00
ff228754b3
Merge polaris sync 01 17 2018
...
Planes, layers, human/update_icon()
2018-01-17 17:56:51 -05:00
10b2cc7eef
Multiple loadout slots ( #4530 )
...
* Multiple loadout slots
Ported from Bay. Each character can have 3 (number can be overridden by config) loadout slots. This way, you can have different outfits for different situations without needing to have a separate character slot or edit your loadout every time.
Tested here, works as intended. The current loadout is set as slot 1, so you don't need to worry about remaking it. This also ports the to_file and from_file macros to make it work, I'm assuming they could later be used elsewhere as well.
* Log of Changing
2018-01-14 14:47:47 -06:00
e4d590f4e2
Add legwraps to loadout shoes list
...
They're for digitigrade people who wanna look stylish!
2017-12-27 14:49:32 -05:00
9e573e69fb
Updates paths due to Polaris change
2017-12-25 22:31:01 -05:00
3a2093ef40
Polaris sync
2017-12-21 04:01:07 -05:00
3b89c5e320
Merge pull request #4384 from Belsima/maid
...
Adds maid bonnet, more hair pins, and adds maid uniform to locker.
2017-12-12 19:51:35 -06:00
ff1103c7d9
Removes the military clothing from the loadout, repaths things
2017-12-07 21:21:05 -06:00
532cc711fa
PsychHUD!
2017-12-04 00:05:10 +00:00
0a76047cef
Loadout adjustments.
2017-12-02 08:59:46 -05:00
2d3a306dea
Loadout additions + fixes. ( #4339 )
...
* Loadout additions + fixes.
* Selection fix.
2017-11-27 19:21:49 -06:00
dcdeba60ae
adds gn set
2017-11-22 23:53:59 +02:00
d699b23e9f
Adds yet another new loadout accessory.
...
-Drop straps. Basically dropped suspenders or drop pouches without the pouches.
-Basically I've been really digging the aesthetic thiccness of the drop pouches and just wanted the look available without the access walls and color restrictions.
-Yeah it's colorable too.
2017-11-22 22:56:38 +02:00
b1bfea36dc
Friendships are no longer priceless
2017-11-18 17:55:35 +00:00
0d9a175aac
Adds bracelets!
2017-11-17 18:27:35 +00:00
7c7794f74f
Unrestricts my fluff goggles for general loadout use.
...
-Opie's orange goggles and Cameron's aesthetic science goggles.
-The orange goggles can also be worn on ear slot in order to have their up state above the hair layer.
2017-11-16 09:31:27 +02:00
8c1fb156be
Adds a cosmetic "armor vest" taur saddlebag subtype.
...
-Works with 4-legged taurs as the other taurbags.
-Has normal backpack stats whereas the other saddlebags have duffle stats.
2017-11-14 16:18:47 +02:00
8714c006ff
Update loadout_accessories.dm
2017-11-10 18:33:44 -05:00
d5e9f96493
Makes wallets (except for orange) free of cost
2017-11-10 18:29:44 -05:00
df89195c48
Makes tracking implant cost 0
...
For preds
2017-11-10 18:28:30 -05:00
11c195debb
Polaris Sync
2017-11-04 13:37:13 -04:00
28ab1e51f3
Removes some loadout items that have colorable versions. ( #4173 )
...
* Removes the 5000 flats options.
* Removes the 5000 hair flower pin options.
2017-11-01 22:19:20 -05:00
6611cb271b
Merge pull request #4190 from mistyLuminescence/plushierework2561
...
Plushie tweaks!
2017-11-01 21:57:56 -05:00
f67a3858cd
Plushie tweaks!
2017-10-31 15:47:00 +00:00
0c480ec15f
Polaris sync
2017-10-27 15:30:24 -04:00
09ff4c1a3a
Cleans up MedAviator code, adds normal aviators to the Command/Sec loadout
2017-10-23 16:30:09 -05:00
d1e939a50d
Adds holo collar to loadout
2017-10-20 16:24:29 -04:00
e76447a719
Loadout stuff, but done right! ( #4094 )
...
* Loadout and accessory path tweaks.
* updated: armbands
* except it's better now
* no ian shirt and psych medHUD, travis fixed?
* OKAY ROUND THREE
2017-10-19 09:36:15 -05:00
1bb71ef429
Polaris Sync
2017-10-16 22:16:24 -04:00
5af9c1971d
Merge pull request #4077 from Anewbe/rings
...
Rings
2017-10-16 19:04:36 -04:00
3c2831e5d9
Adds rings
2017-10-15 15:05:52 -05:00
becc2e4290
Adds heads of staff cloaks, adds them to the loadout.
2017-10-15 15:02:25 -05:00
dea7346b94
Fixes the autologging items in antag records
2017-10-11 21:16:18 -05:00
fa1170c7e8
Should fix all the corp regs & codex issues
2017-10-09 23:42:08 -04:00
15a6472d14
Pol Sync
2017-10-08 17:44:25 -04:00
4b1eb3a19a
Merge pull request #4017 from Anewbe/lawbook
...
Adds Neerti's Law Book
2017-10-05 12:56:23 -04:00
0de6cddef5
Activates Neerti's Lawbook
2017-10-03 22:29:50 -05:00
860c1d2e9f
Makes the auto-antag-record logging for loadout items prettier
2017-10-02 03:08:01 -05:00
7c5d7c4d75
Improves tracking implant code, adds a tracking implant variant to the loadout
2017-09-28 20:25:46 -05:00
bddfa16f82
Polaris sync
2017-09-15 21:17:34 -04:00
fb0e4d3cf9
General uniform updates. ( #3814 )
...
* General uniform update.
* Maps in bathrobe.
* Revert "Maps in bathrobe."
This reverts commit 9cbe47671da7a452cb5ac040aeefdcb98dbe180a.
* Fixes cheongsams and maps in the bath robe.
* Removes unintentionally added sprite.
* Assorted bugfixes.
2017-09-15 17:14:20 -05:00
47afd1502d
Adds a loincloth to the xeno loadout
2017-09-11 21:18:29 -04:00
3bd672954d
Tough boy fluff stuff (Opie goggles + 2 special offer general loadout items)
...
-Adds the approved fluff goggles https://forum.vore-station.net/viewtopic.php?f=26&t=1073
-Also adds general use metal necklace thingy and a colorable headband for loadout selection.
2017-09-06 15:55:16 +03:00
e2ea7951d3
Teshari stuff was added to Polaris.
2017-08-28 21:22:05 -04:00
cafac8efae
Polaris Sync
2017-08-28 20:52:11 -04:00
3650fb1562
Merge pull request #3699 from Belsima/master
...
A load of Teshari stuff: For Real This Time
2017-08-16 22:53:00 -04:00
Arokha Sieyes