Commit Graph

354 Commits

Author SHA1 Message Date
Atermonera
51a70ffa95 Merge pull request #8796 from Cerebulon/bloons
Balloon Expansion (Inflation?)
2022-10-28 14:48:56 -08:00
Spookerton
eea7f4d73a Merge pull request #8755 from Greenjoe12345/commphone
Sleek Communicator
2022-10-24 22:32:18 +01:00
Cerebulon
ed841af4cf Balloon Expansion (Inflation?) 2022-10-24 21:54:22 +01:00
Cerebulon
85ac489598 Fix medical utility uniform loadout selection and wallet colouring 2022-10-24 19:24:18 +01:00
Spookerton
650ee09942 Merge pull request #8763 from Cerebulon/cighands
Cig-related tweaks
2022-10-18 09:30:52 +01:00
Cerebulon
e7a9d286b9 Various cig-related tweaks 2022-10-18 00:34:55 +01:00
Cerebulon
f47a8fb555 A Short Investigation 2022-10-17 14:42:39 +01:00
Greenjoe12345
339ff459ca commphone 2022-10-16 02:03:40 +01:00
Cerebulon
0ac100f6ef Fixes various reported bugs, more consistency 2022-10-10 19:43:27 +01:00
Cerebulon
805608c9f1 More tiny loadout fixes 2022-10-09 19:01:44 +01:00
Spookerton
327a7127d3 Merge pull request #8731 from Cerebulon/insulted
Further loadout tweaks and fixes
2022-10-07 21:15:13 +01:00
Spookerton
d565a3d1f6 Merge pull request #8706 from Cerebulon/jumpsuitsCM
A Jillion Jumpsuits
2022-10-07 21:14:46 +01:00
Spookerton
6e7ca95663 Merge pull request #8728 from Cerebulon/blazerbutton
Fixes blue blazer being double-listed in xenowear and requiring whitelist
2022-10-07 21:14:03 +01:00
Sypsoti
e212411b01 Merge pull request #8705 from Cerebulon/teamfortress2
An Abundance of Hats
2022-10-07 14:26:44 -05:00
Cerebulon
345e4587d7 further tweaks and fixes 2022-10-06 10:45:12 +01:00
Cerebulon
537b0901b1 Actually for consistency it should be this 2022-10-04 13:53:08 +01:00
Cerebulon
57c386cb96 Apologies to some overlooked suits 2022-10-04 13:18:26 +01:00
Cerebulon
7e168edebf blue blazer fix 2022-10-04 12:27:18 +01:00
Cerebulon
3748572e9e Consolidates Loadout Lists (#8714)
* Consolidates loadout listings significantly

* requested tweaks

* Requested tweaks II
2022-10-02 14:57:37 -08:00
Cerebulon
e2c5601095 ports many jumpsuits from CM 2022-09-25 07:42:58 +01:00
Cerebulon
1f7ca14b9c corrects naming of government beret selection from a loadout rename PR 2022-09-24 02:08:58 +01:00
Cerebulon
77ade5d5d3 An Abundance of Hats 2022-09-23 13:30:56 +01:00
Frenjo
412572aa63 Fixes/standardises loadout option naming
Renames almost every loadout option to the new "category, type" system.
2022-08-30 00:23:56 +01:00
Frenjo
a92c8bbc1a Tweaks loadout part III
Reduces the baseline loadout point cost of suits and overwear from 2 -> 1.

Increases the loadout point costs of the following items from 1 -> 2:
- Puffer Coat (all variants): (cold protection)
- Bomber Jacket (all variants): (cold protection)
- Hoodies (all variants): (cold protection)
- Labcoats (all variants): (bio protection)
- Winter Coats (all variants): (cold protection)
2022-08-28 22:29:41 +01:00
Frenjo
bed28dcd49 Resets phase pistol cost
Resets the loadout point cost of phase pistols from 4 -> 5 after discussion with the person who originally set them to that value.
2022-08-28 21:47:54 +01:00
Frenjo
abb8fba933 Tweaks loadout part II
Adds a loadout option for botanic leather gloves, costing 2 points.

Increases the point cost of toeless jackboot variants from 1 -> 2.
2022-08-28 20:02:48 +01:00
Frenjo
461651948f Tweaks loadout part I
Renames the "gloves, work" loadout option to "duty gloves" to more accurately reflect the item being selected and for consistency with the "duty boots".

Fixes a typo in the name of the "jackboots, thigh-length" loadout option.

Tweaks the loadout point costs of the following items:
- Phase Pistol: 5 -> 4 (for consistency with knives, phase is only useful against wildlife whereas knives affect all)
- Black Gloves: 1 -> 2 (for consistency with other functional gloves)
- Duty Gloves: 3 -> 2 (same as above)
- Jackboots (all variants): 1 -> 2 (for consistency with other functional item variants)
- Workboots (all variants): 1 -> 2 (same as above)
- Umbrella: 3 -> 1 (an umbrella is arguably the same amount of functional as a briefcase)
- Custom Laptop: 7 -> 5 (follows the custom tablet having the same cost as the advanced tablet, custom laptop has the same as the advanced laptop)
2022-08-28 19:48:01 +01:00
Greenjoe12345
1b9dfa42cb fix relatively pathed type 2022-05-12 00:18:13 +01:00
Greenjoe12345
ba62bff4b3 clothing 2022-05-12 00:02:02 +01:00
Sypsoti
f102073dcb adds nondrug contraband to loadout 2022-05-03 16:27:36 -05:00
Sypsoti
661b83e61d Drug Expansion (#8575)
* adds drugs and means to make them

* nutmeg sprite and hallucination changes

* adjustments + sounds courtesy of serithi

* nit nack paddy wack
2022-04-29 16:24:16 -08:00
spookerton
556331a6a3 use /global/ sugar for bare globals, no leading / 2022-04-24 07:54:34 +01:00
atermonera
9d71839ac6 Removes devices 2022-04-17 19:14:43 -08:00
atermonera
7a9806d9b4 Removes weapons 2022-04-17 19:14:32 -08:00
Spookerton
019b0e89f8 Merge pull request #8520 from Cerebulon/cop_crap
New holobadges, holsters, and sprites
2022-04-14 18:59:18 +01:00
Sypsoti
6eb8210190 general sprite fixes + chocolate reagent 2022-04-13 15:00:08 -05:00
Cerebulon
68bc068df5 New holobadges, holsters, and sprites 2022-04-11 04:56:18 +01:00
Cerebulon
1ff390003e Merge branch 'master' of https://github.com/PolarisSS13/Polaris into hairnets 2022-03-22 01:39:59 +00:00
Atermonera
4280270e70 Merge pull request #8448 from Cerebulon/mugging
Robs You In Public
2022-03-20 11:28:24 -08:00
Cerebulon
e4d22f96cb Adds a bunch of mug variants 2022-03-18 18:05:24 +00:00
listerla
1850ec171a Adds pride pins to loadout
From https://github.com/tgstation/tgstation/pull/65242/files
2022-03-18 09:30:01 -04:00
Cerebulon
75c7a03a7c Adds Hairnets 2022-03-17 18:48:43 +00:00
Cerebulon
474a8c43cf Decl Music and Ported Music + Licenses (#8221)
* Decl music + ported music

* Bugfixes and not

* unit test

* debug shit + some fixes

* More Changes

* Removes some unused/extra songs in case it was a file size issue

* Nuke crash-prone songs

* Add cynosure defines

* It Just Works Now + Finished Headphone code/sprites

* requested tweaks/debug removal

* recheck dme
2022-03-12 19:45:36 -08:00
Cerebulon
4fad562e9e Cybernetic Augments and Sick Tats (#8200)
* Cybernetic Augments and Sick Tats

* Cybernetic Augments and Sick Tats

* Fixed indentation

* Unused var

* Excludes metal bits from cloning/dna copies.

* Genetics as var

* Add a line.

* what if a list was a list
2022-02-12 23:51:04 -08:00
lbnesquik
5a695d7ab7 Removes phoron rings from the loadout 2021-09-04 11:28:33 +02:00
lbnesquik
6df060c7cb Adds a couple more extra rings. 2021-09-02 08:41:01 +02:00
lbnesquik
a94744bd99 Add phoron rings to the loadout. Sorts the rings in the code a bit because it is prettier like this. 2021-09-02 08:05:33 +02:00
MistakeNot4892
6425be0fa8 Merge pull request #8260 from Cerebulon/clothes-aug2021
Adds a Whole Buncha More Clothes
2021-09-01 10:04:13 +10:00
MistakeNot4892
29fd66259c Merge pull request #8231 from Cerebulon/labcoats
New Labcoat Sprites
2021-08-31 10:10:12 +10:00
Cerebulon
10dc5f5680 PoIs + virgin 2021-08-29 13:51:27 +01:00