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

Legion corpse rework #2543

Merged
merged 90 commits into from
May 31, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
90 commits
Select commit Hold shift + click to select a range
31b5559
kills waldo and loops
FalloutFalcon Nov 25, 2023
bd0d884
more loops
FalloutFalcon Nov 25, 2023
694b5ff
sorts em
FalloutFalcon Nov 25, 2023
5842d5d
glasses c:
FalloutFalcon Nov 25, 2023
8d44251
tweaking the loot for infiltrator
FalloutFalcon Nov 25, 2023
45882a2
replaces the broken cham with full kit
FalloutFalcon Nov 25, 2023
55730ba
a gun
FalloutFalcon Nov 25, 2023
054d8a9
cool glasses
FalloutFalcon Nov 25, 2023
b044626
tweaks to operative
FalloutFalcon Nov 25, 2023
884bf0e
gloves
FalloutFalcon Nov 25, 2023
c68df9b
hardsuit was helmet
FalloutFalcon Nov 25, 2023
a8f970a
no thermals
FalloutFalcon Nov 25, 2023
2685c73
Merge branch 'master' into kills-waldo
FalloutFalcon Nov 25, 2023
f3ab61e
backwards statment
FalloutFalcon Nov 25, 2023
f357fea
unsure why i am failing tests
FalloutFalcon Nov 26, 2023
bbdce88
Apply suggestions from code review
FalloutFalcon Nov 29, 2023
6ed38c7
yuh
FalloutFalcon Nov 29, 2023
ed781cf
Merge branch 'master' into kills-waldo
FalloutFalcon Nov 29, 2023
97d6320
Merge branch 'master' into kills-waldo
FalloutFalcon Nov 29, 2023
6d052a4
wanna test if this works
FalloutFalcon Nov 29, 2023
f811f5b
shrug
FalloutFalcon Nov 29, 2023
a3e9294
forgot the include
FalloutFalcon Nov 29, 2023
94665b1
dunno
FalloutFalcon Nov 29, 2023
74ea55a
fix
FalloutFalcon Nov 29, 2023
7b67bbb
i cant even build rn cause im laptop gaming
FalloutFalcon Nov 29, 2023
bcd7f00
good progress
FalloutFalcon Nov 29, 2023
cd937a1
better pick
FalloutFalcon Nov 29, 2023
b790db6
oop
FalloutFalcon Nov 29, 2023
22c8ec8
shrug
FalloutFalcon Nov 29, 2023
9a4dddc
fix
FalloutFalcon Nov 29, 2023
7762e54
guns
FalloutFalcon Nov 29, 2023
161c968
engineer
FalloutFalcon Nov 29, 2023
9d809d5
starting to think i can shrink the hivelord code
FalloutFalcon Nov 29, 2023
f5db127
need to trim the size of this pick
FalloutFalcon Nov 29, 2023
b040867
blind
FalloutFalcon Nov 29, 2023
9c6aa8b
there name is so cool.....
FalloutFalcon Nov 29, 2023
d27ed84
Merge branch 'master' into legion-rework
FalloutFalcon Nov 29, 2023
bed830b
minor tweaks
FalloutFalcon Nov 29, 2023
9503b98
names and stuf
FalloutFalcon Nov 29, 2023
52ceb1a
hm plans in the works
FalloutFalcon Nov 29, 2023
0908bf9
testing it and it all seems to be functinal
FalloutFalcon Nov 29, 2023
9a269f5
agh
FalloutFalcon Nov 29, 2023
945e93f
some more stufg
FalloutFalcon Nov 30, 2023
2d9b84c
put yo shirt on...
FalloutFalcon Nov 30, 2023
81ce16b
doctor!!
FalloutFalcon Dec 6, 2023
fdd0c77
this pr is really starting to smell tbh
FalloutFalcon Dec 6, 2023
d30f63b
yea
FalloutFalcon Dec 18, 2023
204ecd8
Merge branch 'master' of https://github.com/shiptest-ss13/Shiptest in…
FalloutFalcon Dec 18, 2023
0898a3c
faction stuff is eh
FalloutFalcon Dec 18, 2023
f027a0c
shrug
FalloutFalcon Dec 18, 2023
50cf704
miner loot rate tweak
FalloutFalcon Dec 18, 2023
35f8e35
all look like jobs now, need to add real loot
FalloutFalcon Dec 18, 2023
42743b3
yea
FalloutFalcon Dec 18, 2023
6e42b04
agh
FalloutFalcon Dec 18, 2023
8f65870
no more faction gear
FalloutFalcon Dec 18, 2023
3b0e3f4
Kills him
FalloutFalcon Dec 18, 2023
467e1c3
first try?
FalloutFalcon Dec 18, 2023
7a043df
minor mistake (dead)
FalloutFalcon Dec 18, 2023
8bf1fbb
revert
FalloutFalcon Dec 18, 2023
60ddaaf
basic enough?
FalloutFalcon Dec 18, 2023
772c47d
agh
FalloutFalcon Dec 18, 2023
5590e56
include
FalloutFalcon Dec 18, 2023
abb7e16
test?
FalloutFalcon Dec 18, 2023
83f70dc
dunno
FalloutFalcon Dec 18, 2023
c84b0c0
yea
FalloutFalcon Dec 19, 2023
970e101
doctor tweak
FalloutFalcon Dec 19, 2023
83702d4
Merge branch 'master' into legion-rework
FalloutFalcon Dec 24, 2023
c0ec5c0
shrug
FalloutFalcon Dec 28, 2023
0b9eacb
yuh
FalloutFalcon Jan 4, 2024
cdb77cd
i dunno what to do about the fails
FalloutFalcon Jan 11, 2024
98090ac
if
FalloutFalcon Jan 11, 2024
3fa7182
evil tbh
FalloutFalcon Jan 11, 2024
10e1c41
random sprite fixes
FalloutFalcon Jan 11, 2024
092c234
Merge branch 'master' into legion-rework
FalloutFalcon Jan 11, 2024
4621608
Merge branch 'master' into legion-rework
FalloutFalcon Jan 22, 2024
8fdb556
Merge remote-tracking branch 'upstream/master' into legion-rework
FalloutFalcon Feb 24, 2024
2d1361a
Merge branch 'master' into legion-rework
FalloutFalcon Mar 4, 2024
1398211
path fixes
FalloutFalcon Mar 5, 2024
d591fa1
Merge branch 'master' into legion-rework
FalloutFalcon Mar 5, 2024
92921b5
species
FalloutFalcon Mar 18, 2024
2ff1610
log any random outfit fail instead of failing
FalloutFalcon Mar 21, 2024
613bb53
Merge branch 'master' into legion-rework
FalloutFalcon Apr 1, 2024
4c7bd28
Merge branch 'master' into legion-rework
FalloutFalcon Apr 16, 2024
52098bd
Merge branch 'master' into legion-rework
FalloutFalcon Apr 17, 2024
3f3c44f
Merge branch 'master' into legion-rework
FalloutFalcon Apr 19, 2024
d65000a
Merge branch 'master' into legion-rework
FalloutFalcon Apr 19, 2024
f52a1ef
Merge branch 'master' into legion-rework
FalloutFalcon Apr 23, 2024
e103ea7
Merge branch 'master' into legion-rework
FalloutFalcon May 15, 2024
f88caaf
Merge branch 'master' into legion-rework
FalloutFalcon May 20, 2024
36bde42
Merge branch 'master' into legion-rework
Sun-Soaked May 31, 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
3 changes: 3 additions & 0 deletions code/datums/outfit.dm
Original file line number Diff line number Diff line change
Expand Up @@ -104,6 +104,9 @@
/// Set to FALSE if your outfit requires runtime parameters
var/can_be_admin_equipped = TRUE

// Used to determine if it should be ignored in unit tests due to being to dynamic to always spawn backpack contents right
var/random = FALSE

/**
* extra types for chameleon outfit changes, mostly guns
*
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -5,11 +5,9 @@

/obj/structure/closet/secure_closet/engineering_chief/PopulateContents()
..()
//WS Begin
new /obj/item/clothing/head/beret/ce(src) //Berets
new /obj/item/clothing/under/rank/command(src) //Better command uniforms
new /obj/item/stack/tape/industrial/pro(src) //Better tape
//WS End
new /obj/item/clothing/neck/cloak/ce(src)
new /obj/item/clothing/under/rank/engineering/chief_engineer(src)
new /obj/item/clothing/under/rank/engineering/chief_engineer/skirt(src)
Expand Down Expand Up @@ -40,9 +38,7 @@
/obj/structure/closet/secure_closet/engineering_electrical/PopulateContents()
..()
var/static/items_inside = list(
//WS Begin
/obj/item/stack/tape/industrial/electrical = 1, // Better tape
//WS End
/obj/item/clothing/gloves/color/yellow = 2,
/obj/item/storage/toolbox/electrical = 3,
/obj/item/electronics/apc = 3,
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -79,13 +79,11 @@

/obj/structure/closet/secure_closet/CMO/PopulateContents()
..()
//WS Begin
new /obj/item/storage/belt/medical(src) //Gives the CMO a belt
new /obj/item/storage/bag/medical(src) //Medibags
new /obj/item/clothing/head/beret/cmo(src) //Berets
new /obj/item/clothing/under/rank/command(src) //Better command uniforms
new /obj/item/storage/box/hypospray/CMO(src) //Hypo mk. 2s
//WS End
new /obj/item/clothing/neck/cloak/cmo(src)
new /obj/item/clothing/suit/bio_suit/cmo(src)
new /obj/item/clothing/head/bio_hood/cmo(src)
Expand Down
5 changes: 5 additions & 0 deletions code/modules/client/loadout/loadout_accessories.dm
Original file line number Diff line number Diff line change
Expand Up @@ -77,6 +77,11 @@
description = "Standard hand coverings for everyday use."
path = /obj/item/clothing/gloves/color/white

/datum/gear/accessory/gloves/fingerless
display_name = "fingerless gloves"
description = "Radical hand coverings for everyday use."
path = /obj/item/clothing/gloves/fingerless

/datum/gear/accessory/gloves/evening
display_name = "evening gloves"
description = "Excessively fancy elbow-length gloves."
Expand Down
Loading
Loading