Commit Graph

1481 Commits

Author SHA1 Message Date
ItzGabby
68bf156091 Merge branch 'master' into bark-box 2021-03-19 02:48:31 -04:00
ItzGabby
4a49f6eebe barked on 2021-03-19 01:38:17 -04:00
silicons
f6f2c27e90 Merge pull request #14442 from SandPoot/master
Adds the skirt variant of the "Tactitool Turtleneck" to the loadout
2021-03-18 06:40:51 -06:00
silicons
bb03d4ff41 Merge pull request #14446 from The-Sun-In-Splendour/secciejacket
shameless buff to sec jacket
2021-03-18 06:39:24 -06:00
SandPoot
6bf711d7ec Update syndicate.dm 2021-03-16 22:54:59 -03:00
The-Sun-In-Splendour
3dfa54270f Update labcoat.dm 2021-03-16 06:49:45 +01:00
SandPoot
5d13d61ea7 upload files 2021-03-15 11:11:17 -03:00
kiwedespars
01b026f889 trailing newlines 2021-03-09 12:53:53 -08:00
kiwedespars
3b92e33112 Merge branch 'master' into void-but-for-real 2021-03-09 12:29:50 -08:00
kiwedespars
3ce6459aef void heretic and many other prs 2021-03-09 02:58:34 -08:00
Letter N
754c24748e Merge remote-tracking branch 'origin/master' into hardsync-1.5 2021-03-03 17:09:01 +08:00
silicons
638b6d05ac Merge pull request #14333 from Detective-Google/hamburger
departmental-ish turtlenecks
2021-02-28 22:49:09 -07:00
Lin
41f227bc5e Merge pull request #14321 from Putnam3145/windbreaker-fix
Makes polychromic windbreaker's message not be nonsense
2021-02-27 14:43:35 -06:00
Detective Google
0d2eef3cc4 for everyone 2021-02-27 04:45:23 -06:00
Detective Google
2ae258d002 turtlenecks 2021-02-27 04:42:05 -06:00
silicons
9e6fb3a310 Merge pull request #14281 from kiwedespars/undo-what-has-been-done
parrying nerf/pugilism buff
2021-02-26 13:36:09 -07:00
Putnam
ac0fd530f2 Makes polychromic windbreaker's message not be nonsense 2021-02-26 00:13:23 -08:00
Letter N
5304029dd9 Merge remote-tracking branch 'origin/master' into hardsync-1.5 2021-02-23 11:01:42 +08:00
silicons
4ba9df18de Merge pull request #14279 from Adelphon/boon
bugfix
2021-02-21 14:53:39 -07:00
silicons
841bb2aac2 Merge pull request #14265 from SandPoot/tool_behavior-replacing
Tool behavior replacing
2021-02-21 14:48:50 -07:00
kiwedespars
15a8d1d5e0 i did a thing
- reverted salt nerf
- made it so you can't parry while resting
2021-02-20 17:24:30 -08:00
Adelphon
f795d007a9 bugfix 2021-02-20 18:18:27 -05:00
Letter N
037378eb7d Merge remote-tracking branch 'origin/master' into hardsync-1.5 2021-02-19 10:34:47 +08:00
SandPoot
123de14009 upload files 2021-02-18 15:05:39 -03:00
SandPoot
f738023097 Revert "Merge branch 'tool_behavior-replacing' of https://github.com/SandPoot/Citadel-Station-13 into tool_behavior-replacing"
This reverts commit 2e29f30fdf, reversing
changes made to 724910cfab.
2021-02-18 15:04:46 -03:00
SandPoot
cf2e70671a upload files 2021-02-18 14:47:10 -03:00
Letter N
3f40e353aa Merge remote-tracking branch 'origin/master' into hardsync-1.5 2021-02-16 19:41:53 +08:00
Adelphon
4c6685333b Polychromic Pants & Jacket 2021-02-16 05:24:45 -05:00
silicons
5990a3ad4b Merge pull request #14227 from Adelphon/polycloth
CLOAK, PARKA, COLORFUL SHOES
2021-02-13 19:06:46 -07:00
silicons
aeb9b1e06c Merge pull request #14233 from DeltaFire15/armwrap-kneecap
About unarmed parrying..
2021-02-13 19:06:39 -07:00
Letter N
45d6a5f87f it compiles, UNTESTED YET 2021-02-13 21:41:59 +08:00
silicons
76837ee0b6 Merge pull request #14225 from Hatterhat/dth-kit-pass2
[hello if someone could fight the maintainers to take a look that'd be great] fixes durathread armor kits
2021-02-12 18:54:36 -07:00
DeltaFire
06101ee9c8 sigh 2021-02-12 03:30:15 +01:00
Adelphon
919e23c122 More Clothes 2021-02-11 02:36:50 -05:00
Hatterhat
3040eca4e0 holy shit what was i thinking god FUCK durathread 2021-02-11 00:20:49 -06:00
silicons
74a7c1e9fb Merge pull request #14203 from zeroisthebiggay/patch-4
makes the a.sterile mask no longer hide your face
2021-02-10 02:09:20 -07:00
Adelphon
28d1f93b1c Clothing PR
I added two clothing that I made.
2021-02-09 00:41:11 -05:00
silicons
70155a8fb2 Merge pull request #14194 from Chiirno/WaddlersRiseUp
Adds clown waddle to clown shoes.
2021-02-08 03:02:40 -07:00
zeroisthebiggay
0c0ff44c23 pog
pog
2021-02-07 22:01:57 -05:00
Lin
fe263ae2ff Merge pull request #13890 from silicons/parry
ablative parry armwraps
2021-02-05 23:52:18 -06:00
Chiirno
e58f170057 begrudgingly added ctrl+click to the examine info. 2021-02-04 19:37:34 -04:00
Chiirno
c85e381169 Waddlers rise upgit add * 2021-02-04 18:25:37 -04:00
zerothebigboy
c6420ae433 fuck 2021-01-27 22:59:44 -05:00
silicons
912b09d33b Merge pull request #14146 from zeroisthebiggay/ooffuck
RP ports featuring accessories, small code fixes, shibari ropes, stockings, and celebrating 2021's animal or whatever
2021-01-27 19:08:19 -07:00
zerothebigboy
ee74f2c06c here comes fetish content 2021-01-27 15:38:34 -05:00
zerothebigboy
f3072433ff thankyoubasedrp 2021-01-27 14:56:26 -05:00
zeroisthebiggay
0bc8c9383c Update miscellaneous.dm 2021-01-26 13:17:44 -05:00
zerothebigboy
7b2a6955cc please 2021-01-26 13:13:09 -05:00
silicons
718cb3f501 Merge pull request #14092 from BlueWildrose/Timidwomen
Adds Timid wo/man costumes
2021-01-20 15:21:06 -07:00
silicons
9f50ea66c8 Merge pull request #14104 from LetterN/semi-sync
[s] semi sync- we forgot the anti ddos thing
2021-01-20 15:14:37 -07:00