Commit Graph

3690 Commits

Author SHA1 Message Date
SandPoot
5b85c260a7 Upload files 2021-11-15 01:34:30 -03:00
LetterN
8b16653744 Merge remote-tracking branch 'origin/master' into what-should-i-name-this-branch 2021-11-12 08:50:23 +08:00
keronshb
659d7aa715 Merge remote-tracking branch 'upstream/master' into familyport 2021-11-11 19:35:40 -05:00
Lin
efa73d987c Merge pull request #15300 from DrPainis/patch-2
Fixes racial blood colors.
2021-11-10 23:40:35 +00:00
Timothy Teakettle
17f68433e1 Update sleeper.dmi 2021-11-05 15:45:55 +00:00
shellspeed1
3090194042 adds sprite 2021-11-03 18:48:38 -07:00
Trilbyspaceclone
5bd9b440a9 Ashen tree! 2021-11-01 11:27:42 -04:00
LetterN
e3e1143c52 i forgot about this regresion 2021-10-30 13:29:55 +08:00
LetterN
99019166e4 i think it works
MAJOR antag backend update
- you cannot bruteforce the pen anymore
- uplink now uses bitflag to lock purchases
- poplock is handled entirely by the buyable uplink items
- tgui antag intro (for selected ones)
2021-10-30 11:45:50 +08:00
keronshb
8978ee10fe Merge remote-tracking branch 'upstream/master' into familyport 2021-10-28 14:41:46 -04:00
keronshb
c80d65df73 Merge branch 'master' into familyport 2021-10-28 14:34:20 -04:00
LetterN
f7b898a2a9 frontend 2021-10-28 17:34:52 +08:00
silicons
a14549d07b Merge pull request #15299 from Hatterhat/cgau
funny hands gaming - adds proto-kinetic gauntlets
2021-10-27 13:36:08 -07:00
silicons
679189cb3d Merge pull request #15277 from Hatterhat/autoloom
i've been sitting on this a while but here have the AUTOLOOM
2021-10-27 05:13:40 -07:00
WanderingFox95
4b13d1772c [Ready] Bone Anvil and processable Bone ingots (#15290)
* Adding all the extra stuff

* whoops, slipped my last fix in here.

* bone balance

* 6 Goliaths + 3 Watchers + 1 Legion

* bumps the damage modifier down to 1.05

* More Bones.

* Undoes the undoing of the other fix PR

Co-authored-by: Emily <null>
2021-10-25 18:11:54 +02:00
DrPainis
4661066261 adds the new blood file
the PR actually does what the title says now
2021-10-23 02:11:24 -04:00
DrPainis
07640c82cd deletes the blood file to fork the repository since I am going to put it back anyways 2021-10-23 02:09:03 -04:00
Hatterhat
7fb3666f43 funny hands gaming 2021-10-22 22:05:18 -05:00
Emily
5b8ecf721d Adds the base tripoly sprite that was absent. 2021-10-20 09:41:35 +02:00
Hatterhat
7e7a5af53a brought to you by neilcic - Floor Corn 2021-10-16 05:00:15 -05:00
keronshb
3cfea7eb92 Ball2021 2021-10-16 00:02:05 -04:00
keronshb
3905e3e219 Hopefully fixes the mask, please im begging you 2021-10-15 19:29:45 -04:00
keronshb
6b23d177c8 Merge remote-tracking branch 'upstream/master' 2021-10-15 19:25:41 -04:00
keronshb
672765cb30 Removes all mask changes 2021-10-15 19:24:27 -04:00
keronshb
b278a0da26 Now adds the new mask sprite 2021-10-15 19:16:02 -04:00
keronshb
55f4c49e9b Download from cit main directly 2021-10-15 19:09:41 -04:00
keronshb
95bb14bb67 Adds the missing hats, missing wings, and clothes to vendor. 2021-10-15 16:59:16 -04:00
keronshb
1cd2c59776 Merge branch 'master' into familyport 2021-10-15 14:43:53 -04:00
keronshb
532fffa7e2 Please fix this 2021-10-15 14:41:35 -04:00
keronshb
a2602a092c Correct fix? 2021-10-15 14:38:04 -04:00
keronshb
7a13354e9b Another linter fix 2021-10-15 14:30:23 -04:00
keronshb
3edec0bade Removes the extra icons folder 2021-10-15 14:27:08 -04:00
silicons
d17419ed54 Merge pull request #15256 from keronshb/fatdart
no idea what this thing even is but he's chuffin back a fat dart and that's all that matters
2021-10-15 00:18:39 -07:00
keronshb
41013ec815 Part 2 - Missing stuff from original families port 2021-10-12 12:07:02 -04:00
silicons
91e7cb293c Merge pull request #15223 from Hatterhat/yeehaw-box
The Yeehaw Update - makes .38 lever-actions slightly more accessible
2021-10-11 20:45:42 -07:00
keronshb
0bae06adcd Original Port 2021-10-11 22:00:54 -04:00
keronshb
562c714a1e Fixes the north sprite 2021-10-08 17:36:27 -04:00
keronshb
e5f66413c8 fat dart
no idea what this even is
2021-10-08 17:28:25 -04:00
Cazz
9805224ede adds neo kanji language 2021-10-07 02:53:08 -05:00
Chayse Ramsay
e642bfc3c7 Update surgery.dmi 2021-10-04 19:25:55 +01:00
WanderingFox95
83987db48a Merge branch 'Citadel-Station-13:master' into WanderingFox95-TribalOverhaul 2021-10-01 18:51:46 +02:00
Hatterhat
1d005db9a8 THE YEEHAW UPDATE 2021-09-30 23:10:33 -05:00
WanderingFox95
84f1b6a7a4 these too 2021-09-24 01:02:27 +02:00
WanderingFox95
f2075db4df put these in the wrong place. 2021-09-24 01:02:17 +02:00
buffyuwu
f59bcedc30 updated green jacket 2021-09-21 01:09:39 -04:00
buffyuwu
eb43981dea adds 4 loadout jackets
more clothing ported from RP/existing TG assets with minor edits on some. available in loadout for pre-round selection and character customization.

also fixes flannels by porting additional sprites so they can now be closed/opened. note: this changes some of the flannel /obj/ paths from example: /obj/item/clothing/suit/jacket/flannel/brown
TO
/obj/item/clothing/suit/toggle/jacket/flannel/brown

🆑
fix: flannels can now be toggled in style
add: ports more rp and existing tg assets with minor edits into loadout
/🆑
2021-09-20 19:04:47 -04:00
WanderingFox95
d668c8f3be fixes gloves again 2021-09-20 00:17:26 +02:00
WanderingFox95
c99df01c87 Merge branch 'Citadel-Station-13:master' into WanderingFox95-TribalOverhaul 2021-09-20 00:16:27 +02:00
WanderingFox95
0c3fd273c6 Add files via upload 2021-09-20 00:16:19 +02:00
WanderingFox95
f2fe5d0c96 unsync 2021-09-20 00:13:45 +02:00