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
e0cc6e3502
Merge pull request #14391 from kiwedespars/void-but-for-real
...
[HERETICS] Void & a handful of heretics-related PRS
2021-03-18 06:38:40 -06:00
5d13d61ea7
upload files
2021-03-15 11:11:17 -03:00
e4ab673e4a
Adds Shrine Maiden outfit for donator
2021-03-14 18:40:01 -05:00
56b0a49902
brain is like monkey, it forgets the newlines
2021-03-11 21:32:11 -08:00
e145bdafe8
adds domain expansion
...
- adds domain expansion, final spell for void heretics
- makes clap1 into an emote
- makes cleave a little more enticing with two guaranteed critical wounds and brute damage
- buffs void mark
2021-03-11 21:26:58 -08:00
8989394742
Merge pull request #14270 from LetterN/rustsql
...
Removes bsql 2
2021-03-03 00:53:46 -07:00
195d05b051
Merge pull request #14343 from Hatterhat/thanks-jay
...
no more nt chokers society has progressed past the need for nt chokers
2021-03-02 15:09:39 -06:00
28833b67b8
you guys are not gonna fucking believe this
2021-02-28 21:09:41 -06:00
573f86e223
Merge remote-tracking branch 'origin/master' into rustsql
2021-02-28 09:07:35 +08:00
0d2eef3cc4
for everyone
2021-02-27 04:45:23 -06:00
2ae258d002
turtlenecks
2021-02-27 04:42:05 -06:00
59990abd25
grr
2021-02-27 08:41:54 +08:00
b2b8534edc
im fucking retarded thinking that was balanced
2021-02-24 18:50:12 +01:00
5c39381117
Merge remote-tracking branch 'origin/master' into rustsql
2021-02-23 11:36:05 +08:00
5517678780
Merge pull request #14286 from Citadel-Station-13/metalmaskDonator
...
Donator Item - Metal Mask
2021-02-22 11:15:37 -06:00
73be04412b
Donator Item - Metal Mask
2021-02-21 19:57:43 -06:00
f581d8c8e0
Merge pull request #14264 from dzahlus/pain-emote-updates
...
Pain emote is now added to getting wounded! As well as more pain sounds
2021-02-21 14:56:26 -07:00
4ba9df18de
Merge pull request #14279 from Adelphon/boon
...
bugfix
2021-02-21 14:53:39 -07:00
ae63422727
Merge pull request #14269 from Putnam3145/aphro-readd
...
More arousal logging; adds back aphro/nympho
2021-02-21 14:50:32 -07:00
0bb5ec3316
Merge remote-tracking branch 'origin/master' into rustsql
2021-02-21 09:55:36 +08:00
f795d007a9
bugfix
2021-02-20 18:18:27 -05:00
c70b9bb58d
Merge pull request #14260 from timothyteakettle/undeleted-query
...
fixes the 'undeleted query' message at the start of every shift
2021-02-20 03:02:15 -07:00
cbac292731
Adds back aphro, nympho
2021-02-18 21:22:43 -08:00
7d39949a2f
Merge remote-tracking branch 'origin/master' into rustsql
2021-02-19 12:38:32 +08:00
98d23bb87b
Merge pull request #14256 from Adelphon/ppantsg
...
Polychromic Pants & Jacket
2021-02-18 17:41:51 -07:00
bf61249fcd
new pain sounds
2021-02-18 04:38:02 +01:00
76b4d4a7dc
Update mentor.dm
2021-02-16 21:02:35 +00:00
4c6685333b
Polychromic Pants & Jacket
2021-02-16 05:24:45 -05:00
a17716be5b
bye
2021-02-16 18:15:02 +08:00
5990a3ad4b
Merge pull request #14227 from Adelphon/polycloth
...
CLOAK, PARKA, COLORFUL SHOES
2021-02-13 19:06:46 -07:00
816ee5f61c
Merge branch 'master' into cm13-pain-emote
2021-02-11 23:42:42 +01:00
a5f7718fe1
PLEASE I BEG YOU
2021-02-11 15:03:02 +01:00
919e23c122
More Clothes
2021-02-11 02:36:50 -05:00
bbcc0a5a0d
fixes travis error hopefully
2021-02-11 01:57:56 +01:00
c9d917b22d
Merge pull request #14201 from dzahlus/flechette-buff
...
Flechette Rifle/CX Shredder now work with wounds
2021-02-10 02:09:38 -07:00
28d1f93b1c
Clothing PR
...
I added two clothing that I made.
2021-02-09 00:41:11 -05:00
7778ddaf96
Merge pull request #14195 from Citadel-Station-13/choker
...
Donator Item - NT Choker
2021-02-08 13:56:44 -06:00
7da856ebef
remove bleed
...
haha forgot this for a second
2021-02-07 17:09:35 +01:00
601305426f
wounds now work
2021-02-07 17:08:06 +01:00
cf4a5f3388
Merge pull request #14189 from dzahlus/diversify-sound
...
Diversify weapon sound
2021-02-06 11:42:36 -07:00
f236b2da29
Merge branch 'master' into Dispencer-UI-change
2021-02-06 02:40:27 +00:00
aba8d2ce2b
NT Choker donator item
2021-02-05 09:57:19 -06:00
2322652d48
haha oops forgotthis existed
2021-02-05 13:04:11 +01:00
80b607f7bd
*pain
...
AAWHG! Adds pain emote and respective sounds for male and female
2021-02-04 19:59:57 +01:00
ee7c45fe77
Merge pull request #14031 from Putnam3145/fermi-emp-fix
...
Fixes fermichem EMPs being massive.
2021-01-30 18:44:20 +01:00
90bd136dad
Update modular_citadel/code/modules/client/loadout/head.dm
...
Co-authored-by: Hatterhat <31829017+Hatterhat@users.noreply.github.com >
2021-01-29 07:38:37 -05:00
c6420ae433
fuck
2021-01-27 22:59:44 -05:00
1d72a574b2
Merge pull request #14093 from timothyteakettle/rename-redescribe-loadout
...
loadout part 3: custom names and descriptions
2021-01-27 19:09:41 -07:00
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
silicons