Commit Graph

32792 Commits

Author SHA1 Message Date
Atermonera
b9e2f498c3 Merge pull request #8737 from Spookerton/spkrtn/fix/type2parent-correction
fix || in type2parent switch, gentle refactor
2022-10-13 17:58:34 -08:00
Spookerton
1e279b9cdc Merge pull request #8745 from Cerebulon/gunspritesoct22
Complete gun sprite overhaul + additions
2022-10-13 10:26:30 +01:00
Spookerton
f94039b331 Merge pull request #8742 from Cerebulon/shuttle_walls
Replaces shuttle windows with dummy objects for aesthetic reasons
2022-10-13 10:25:46 +01:00
Spookerton
39cebe388e Merge pull request #8741 from Cerebulon/sprite_tweaks_oct
Adjustments to recent sprites
2022-10-13 10:25:29 +01:00
Spookerton
5d6034a3cb Merge pull request #8739 from Cerebulon/firefighting-gear
Firefighting Gear
2022-10-13 10:24:50 +01:00
Cerebulon
7f682454ae little tweaks 2022-10-12 23:52:29 +01:00
Cerebulon
72e731c9b9 Complete gun sprite overhaul + additions 2022-10-12 23:16:52 +01:00
Cerebulon
89383b0d2a False-walls for shuttle 2022-10-10 21:31:40 +01:00
Cerebulon
731d45c4fc why were those existing space characters. incomprehensible. 2022-10-10 20:02:53 +01:00
Cerebulon
1a4aaeb98e Adjustments to recent sprites 2022-10-10 19:59:08 +01:00
Cerebulon
0ac100f6ef Fixes various reported bugs, more consistency 2022-10-10 19:43:27 +01:00
Cerebulon
da8126552e map repaths 2022-10-09 20:26:50 +01:00
Cerebulon
575a27edcb Firefighting gear 2022-10-09 20:02:54 +01:00
Cerebulon
805608c9f1 More tiny loadout fixes 2022-10-09 19:01:44 +01:00
Cerebulon
c8db840afd Merge branch 'master' of https://github.com/PolarisSS13/Polaris into flan 2022-10-09 18:56:50 +01:00
Cerebulon
df75515efb Fixes flannel shirt loadout selection 2022-10-09 18:41:48 +01:00
spookerton
5fe5a8f939 fix || in type2parent switch, gentle refactor 2022-10-09 11:54:05 +01:00
Cerebulon
c463104999 Ports Diagonal Movement (#8199)
* Ports Diagonal Movement

* Requested tweaks

* mathemagical correction

* Update code/modules/keybindings/setup.dm

Co-authored-by: Spookerton <spkrtn@pm.me>

* Update code/_helpers/type2type.dm

Co-authored-by: Spookerton <spkrtn@pm.me>

* Update code/modules/keybindings/setup.dm

Co-authored-by: Spookerton <spkrtn@pm.me>

* fixed merge error

* Fixes falling, speed calculation, and non-hotkey WASD

Co-authored-by: Spookerton <spkrtn@pm.me>
2022-10-07 23:36:14 -08: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
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
76fb834edf Merge pull request #8732 from Cerebulon/underwear
Adds and updates some underwear and undershirt options
2022-10-07 21:11:32 +01:00
Spookerton
4eba36f3a8 Merge pull request #8730 from Cerebulon/teshdirectionals
Fixes Teshari Directionals
2022-10-07 21:11:20 +01:00
Spookerton
1b45aa70ba Merge pull request #8729 from Cerebulon/stopshowering
Fixed showers not appearing to turn off
2022-10-07 21:11:12 +01:00
Spookerton
df3ecd3a45 Merge pull request #8713 from Greenjoe12345/woodlimb
Morgan Trading prosthetic expansion
2022-10-07 21:10:57 +01:00
Spookerton
5928b9675b Merge pull request #8718 from Cerebulon/shuttleremodel
Shuttle Refit
2022-10-07 21:10:42 +01:00
Spookerton
a596121877 Merge pull request #8721 from Cerebulon/flags
A -ton of Flags
2022-10-07 21:09:37 +01:00
Spookerton
a4b3804617 Merge pull request #8726 from Cerebulon/sope
Rub A Dub Dub
2022-10-07 21:09:20 +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
2b1fcc813d Update code/datums/underwear/undershirts.dm
Co-authored-by: Spookerton <spkrtn@pm.me>
2022-10-07 09:52:37 +01:00
Cerebulon
327b266f17 shiver me unterminated text 2022-10-07 09:49:26 +01:00
Cerebulon
eb03615d1d Update code/game/objects/structures/signs.dm
Co-authored-by: Spookerton <spkrtn@pm.me>
2022-10-07 09:42:41 +01:00
Cerebulon
345e4587d7 further tweaks and fixes 2022-10-06 10:45:12 +01:00
Cerebulon
90659c5c3f Colourable boxers 2022-10-04 16:11:33 +01:00
Cerebulon
a7e3eb88ea Adds and updates some underwear options 2022-10-04 16:08:23 +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
26a8285a18 Fixes Teshari Directionals 2022-10-04 13:12:53 +01:00
Cerebulon
172d073030 Fixed showers not appearing to turn off 2022-10-04 12:46:38 +01:00
Cerebulon
7e168edebf blue blazer fix 2022-10-04 12:27:18 +01:00
Cerebulon
484c2e0545 more soap, better soap 2022-10-03 11:38:57 +01:00
Cerebulon
6dacd73c2c timber shivering support 2022-10-03 11:07:41 +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