Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Extra inventory slots #13

Merged
merged 50 commits into from
Aug 15, 2024
Merged
Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
50 commits
Select commit Hold shift + click to select a range
18d48c5
misery
SandPoot Jul 12, 2024
539f947
awesome
SandPoot Jul 13, 2024
68fe808
more things
SandPoot Jul 17, 2024
206715f
compile
SandPoot Jul 17, 2024
95c851a
oopsie wrong files :))))
SandPoot Jul 17, 2024
1e06b2f
oops, it did help to port from my original pr on sandstorm though
SandPoot Jul 17, 2024
c84639d
stripping plus a requested frame for adding underwear to places
SandPoot Jul 17, 2024
2425c45
MODULARIZE
MosleyTheMalO Jul 19, 2024
aa640ed
Merge branch 'master' into extra-inventory
MosleyTheMalO Jul 19, 2024
1cf56fb
Update tgstation.dme
MosleyTheMalO Jul 19, 2024
dbd545f
TG underwear parity
MosleyTheMalO Jul 20, 2024
4311144
Merge branch 'master' into extra-inventory
MosleyTheMalO Jul 20, 2024
d7e6623
Update tgstation.dme
MosleyTheMalO Jul 20, 2024
d4fe3c5
push
SandPoot Jul 20, 2024
0d32789
Merge branch 'master' into extra-inventory
MosleyTheMalO Jul 21, 2024
8bb688f
unix fixes
MosleyTheMalO Jul 21, 2024
6bc292e
fixes the errors
MosleyTheMalO Jul 21, 2024
23584e3
Update underwear_items.dm
MosleyTheMalO Jul 21, 2024
74f07b8
idk
MosleyTheMalO Jul 21, 2024
0e7e0e7
Update underwear_items.dm
MosleyTheMalO Jul 21, 2024
9b1a32b
Update underwear_items.dm
MosleyTheMalO Jul 21, 2024
5c294ef
Update underwear_items.dm
MosleyTheMalO Jul 21, 2024
b703083
outfits
MosleyTheMalO Jul 22, 2024
ecd0cb1
Mannequin
MosleyTheMalO Jul 22, 2024
33e36b2
makes it compatible
MosleyTheMalO Jul 23, 2024
e1c608e
Merge branch 'master' into extra-inventory
MosleyTheMalO Jul 23, 2024
cf0eed9
Update species.dm
MosleyTheMalO Jul 23, 2024
9e57b89
Merge branch 'master' into extra-inventory
MosleyTheMalO Jul 23, 2024
e75e12e
bra (has bugs)
MosleyTheMalO Jul 25, 2024
a1df3d9
Merge branch 'master' into extra-inventory
MosleyTheMalO Jul 26, 2024
d74ca63
Update tgstation.dme
MosleyTheMalO Jul 26, 2024
0f71723
Update inventory.dm
MosleyTheMalO Jul 26, 2024
e91d037
Merge branch 'master' into extra-inventory
MosleyTheMalO Jul 27, 2024
d67ef52
Merge branch 'master' into extra-inventory
MosleyTheMalO Jul 28, 2024
57034f2
Merge branch 'master' into extra-inventory
MosleyTheMalO Jul 31, 2024
6384f61
almost there
MosleyTheMalO Aug 1, 2024
26649ce
works?
MosleyTheMalO Aug 4, 2024
1ca88ae
Merge branch 'master' into extra-inventory
MosleyTheMalO Aug 9, 2024
9986cad
ears part 1
MosleyTheMalO Aug 9, 2024
962917e
ears 2
MosleyTheMalO Aug 10, 2024
7b87a00
fixed underwear slots
MosleyTheMalO Aug 11, 2024
1e53d7a
verb integration
MosleyTheMalO Aug 11, 2024
30e50f4
Merge branch 'master' into extra-inventory
MosleyTheMalO Aug 11, 2024
816d292
Merge branch 'master' into extra-inventory
MosleyTheMalO Aug 12, 2024
f82b21b
Merge branch 'master' into extra-inventory
MosleyTheMalO Aug 13, 2024
3a1b4be
final touches (probably)
MosleyTheMalO Aug 13, 2024
b70065d
Merge branch 'master' into extra-inventory
MosleyTheMalO Aug 14, 2024
01480c7
Merge branch 'master' into extra-inventory
MosleyTheMalO Aug 14, 2024
923bf1b
procs because flags are unreliable
MosleyTheMalO Aug 14, 2024
da45f51
Update hud.dm
MosleyTheMalO Aug 14, 2024
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
Merge branch 'master' into extra-inventory
  • Loading branch information
MosleyTheMalO committed Aug 11, 2024
commit 30e50f41e4cb73bdbd13ba707b4652a188346e67
2 changes: 2 additions & 0 deletions code/__DEFINES/~~~splurt_defines/mobs.dm
Original file line number Diff line number Diff line change
Expand Up @@ -5,3 +5,5 @@
#define OFFSET_BRA "bra"
#define OFFSET_WRISTS "wrist"
//

#define SPECIES_ARACHNID "arachnid"
9 changes: 9 additions & 0 deletions tgstation.dme
Original file line number Diff line number Diff line change
Expand Up @@ -9277,6 +9277,15 @@
#include "modular_zzplurt\code\modules\mob\living\carbon\human\life.dm"
#include "modular_zzplurt\code\modules\mob\living\carbon\human\species.dm"
#include "modular_zzplurt\code\modules\reagents\chemistry\machinery\chem_dispenser.dm"
#include "modular_zzplurt\code\modules\species\_species.dm"
#include "modular_zzplurt\code\modules\species\arachnid.dm"
#include "modular_zzplurt\code\modules\species\teshari.dm"
#include "modular_zzplurt\code\modules\species\xeno.dm"
#include "modular_zzplurt\code\modules\sprite_accessories\arachnid.dm"
#include "modular_zzplurt\code\modules\surgery\bodyparts\parts.dm"
#include "modular_zzplurt\code\modules\surgery\bodyparts\species_parts\arachnid_parts.dm"
#include "modular_zzplurt\code\modules\surgery\organs\external\arachnid.dm"
#include "modular_zzplurt\code\modules\surgery\organs\internal\eyes\_eyes.dm"
#include "modular_zzplurt\code\modules\surgery\organs\internal\tongue\_tongue.dm"
#include "modular_zzplurt\code\modules\wiremod\core\integrated_circuit.dm"
// END_INCLUDE
Loading
You are viewing a condensed version of this merge commit. You can view the full changes here.