Commit Graph

20823 Commits

Author SHA1 Message Date
Spookerton
d565a3d1f6 Merge pull request #8706 from Cerebulon/jumpsuitsCM
A Jillion Jumpsuits
2022-10-07 21:14:46 +01:00
Spookerton
a4a3e49e2c Merge pull request #8708 from Cerebulon/miscsprites2022
A milieu of misc sprites
2022-10-07 21:14:35 +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
Spookerton
4eba36f3a8 Merge pull request #8730 from Cerebulon/teshdirectionals
Fixes Teshari Directionals
2022-10-07 21:11:20 +01:00
Spookerton
df3ecd3a45 Merge pull request #8713 from Greenjoe12345/woodlimb
Morgan Trading prosthetic expansion
2022-10-07 21:10:57 +01:00
Spookerton
29546fd08f Merge pull request #8735 from Spookerton/spkrtn/fix/8703-8733
Spkrtn/fix/8703 8733
2022-10-07 20:59:19 +01:00
Sypsoti
e212411b01 Merge pull request #8705 from Cerebulon/teamfortress2
An Abundance of Hats
2022-10-07 14:26:44 -05:00
spookerton
d8da5055dd implement suggested behavior for #8733
also removes consequentially unecessary type check
closes #8733
2022-10-07 11:34:39 +01:00
spookerton
a62dd54cf4 implement suggested behavior for #8703
closes #8703
2022-10-07 11:32:35 +01:00
Cerebulon
26a8285a18 Fixes Teshari Directionals 2022-10-04 13:12:53 +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
Atermonera
b087dd00f6 Merge pull request #8722 from Spookerton/spkrtn/sys/sstyping
Adds SSTyping
2022-10-02 10:16:01 -08:00
spookerton
6385d90efc added sstyping 2022-10-02 16:15:56 +01:00
Atermonera
f32c8de8cd Merge pull request #8712 from Cerebulon/notaur
Removes Taurs
2022-10-01 21:38:21 -08:00
Atermonera
502a3783e5 Merge pull request #8719 from Cerebulon/buildmodeimprovements
Admin Build Mode Agony Removal
2022-10-01 11:25:04 -08:00
Cerebulon
674a7ea8ec tgui bgon 2022-09-30 12:07:14 +01:00
Cerebulon
b83aaa7c74 buildmode agony removal 2022-09-30 11:59:57 +01:00
Greenjoe12345
3c0aafbfba woodlimb 2022-09-28 03:33:52 +01:00
Cerebulon
63bcc560c3 Removes Taurs 2022-09-28 03:17:48 +01:00
Cerebulon
4390df9f94 updates news post timeskip 2022-09-28 00:26:22 +01:00
Cerebulon
c9982906ee Ushanka fix + cold protection 2022-09-26 05:34:02 +01:00
Cerebulon
3ffa493575 couple of requested general sprite fixes + grenade sprites 2022-09-26 05:23:33 +01: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
7fa720266e species sprites, gameplay integration 2022-09-23 23:30:46 +01:00
Cerebulon
77ade5d5d3 An Abundance of Hats 2022-09-23 13:30:56 +01:00
Atermonera
db9d667950 Merge pull request #8695 from Frenjo/loadout-tweaks
Overhauls loadout naming and point costs
2022-09-04 22:39:27 -08:00
Spookerton
a5403d6ba0 Merge pull request #8699 from Atermonera/tcomms-monitor-fix
Fix telecomms monitoring consoles
2022-09-03 11:14:42 +01:00
Spookerton
fe2c3cfe8f Merge pull request #8701 from MistakeNot4892/doggo
Fixes oversight with grafadreka reagent processing.
2022-09-03 11:12:54 +01:00
MistakeNot4892
c70a649116 Fixes oversight with grafadreka reagent processing. 2022-09-03 12:17:33 +10:00
atermonera
6034936577 Fix telecomms monitoring consoles 2022-09-01 22:54:23 -08:00
Atermonera
37cfcfc45f Merge pull request #8685 from Spookerton/spkrtn/cng/tweak-effect-aura
cellcharge DoEffectAura sends a message per robot (and friends)
2022-09-01 22:02:55 -08:00
Spookerton
8ce2659f02 Merge pull request #8693 from MistakeNot4892/doggo
Even more drake stuff.
2022-09-01 12:37:58 +01:00
spookerton
cf5b3a6a2d artifact_effect base type cleanup
same style rules as subtypes
inverted behavior of GetAnomalySusceptibility to match its name
2022-09-01 12:11:57 +01:00
spookerton
877569a5f6 artifact_effect misc style pass 2
readable flow control
2022-09-01 12:10:02 +01:00
spookerton
9aaf02722f artifact_effect misc style pass 1
overrides before new definitions
double spaced significant blocks
consistent parameter naming
no var/ in parameters
2022-09-01 11:57:22 +01:00
spookerton
0ca124b0fe remove returns & bad spacing from DoEffectPulse 2022-09-01 11:40:57 +01:00
spookerton
78d48bb498 remove returns & bad spacing from DoEffectTouch 2022-09-01 11:36:34 +01:00
spookerton
cd0c0acc78 remove returns & bad spacing from DoEffectAura 2022-09-01 11:33:33 +01:00
spookerton
2a591a8473 cellcharge DoEffectAura sends a message per robot 2022-09-01 11:31:26 +01:00
Spookerton
b39b61687d Merge pull request #8697 from Atermonera/organ-implant-emp
Organs transfer EMPs to their contents
2022-09-01 10:57:53 +01:00
Spookerton
f7605bee65 Merge pull request #8696 from Atermonera/no_clone-modifier-gets-checked
Checks the no_clone modifier stored in DNA records as a path
2022-09-01 10:57:07 +01:00
atermonera
e17df7e68a Organs transfer EMPs to their contents 2022-08-31 22:36:54 -08:00
atermonera
c034848b53 Checks the no_clone modifier stored in DNA records as a path 2022-08-31 21:52:48 -08: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