Commit Graph

1526 Commits

Author SHA1 Message Date
silicons
c1928c9446 Merge remote-tracking branch 'citadel/master' into combat_v7 2021-06-16 19:04:16 -07:00
Lin
1e66357706 Merge pull request #14851 from Vynzill/spritinghell
Extended Armwraps
2021-06-16 11:30:01 -07:00
Vynzill
df72710cae herewego 2021-06-14 17:19:05 -05:00
silicons
8595e05ad9 Merge remote-tracking branch 'citadel/master' into combat_v7 2021-06-13 15:37:35 -07:00
silicons
a91d5111c4 Merge pull request #14837 from zeroisthebiggay/trojancoyoteskirt
(held against my will) adds a onesleeved croptop
2021-06-13 15:19:37 -07:00
silicons
2dd0d014b9 Merge pull request #14813 from SandPoot/small-issues
Fixes some small issues with cosmetic syndicate clothing (loadout clothing)
2021-06-13 15:15:32 -07:00
zerothebigboy
a395fc1b52 a 2021-06-12 19:58:53 -04:00
SandPoot
d70a35a48d upload syndicate.dm 2021-06-09 15:49:57 -03:00
silicons
eb4b4088f4 Merge pull request #14760 from keronshb/floorcluwneport
Ports Floor Cluwnes and Cluwnes.
2021-06-09 11:21:22 -07:00
silicons
1a800cc470 modifications 2021-06-07 19:40:16 -07:00
WanderingFox95
015bd3c338 Armor for security armor and a small fix 2021-06-02 17:22:46 +02:00
WanderingFox95
5c827d9796 Bit of that 2021-06-02 15:28:46 +02:00
keronshb
70926f5daf Merge remote-tracking branch 'upstream/master' into floorcluwneport 2021-05-31 22:21:34 -04:00
silicons
e1efdb7937 Merge pull request #14750 from keronshb/swagoutfitport
Ports Swag outfit from /tg/
2021-05-27 21:26:52 -06:00
keronshb
78db6bd5c2 Ports Floor Cluwnes
Oh fuck oh god
2021-05-26 21:58:35 -04:00
zeroisthebiggay
bdd7ae54d4 Update miscellaneous.dm 2021-05-24 23:10:07 -04:00
zerothebigboy
fc3c898cd4 tab 2021-05-24 21:49:36 -04:00
zerothebigboy
36fe3fef76 abuse 2021-05-24 21:40:15 -04:00
keronshb
d7ae90eb13 Digitigrade vers 2021-05-24 13:33:12 -04:00
keronshb
77d302f8f6 Ports Swag Outfit 2021-05-24 12:47:55 -04:00
zerothebigboy
bc61ada440 KILL 2021-05-19 13:24:40 -04:00
zerothebigboy
af4823e83c KILL 2021-05-19 09:19:49 -04:00
zerothebigboy
e22bdc3fb5 KILL 2021-05-18 18:56:28 -04:00
zerothebigboy
fff719c408 KILL 2021-05-18 18:47:12 -04:00
zerothebigboy
5138d86655 skylarlineman'safurry 2021-05-05 03:35:25 -04:00
Lin
c80c974b6c Merge pull request #14668 from qweq12yt/fix-riot-suit
[Fix] Restores the Sprite for the Riot Suit
2021-04-29 22:24:00 -05:00
silicons
9bef72f205 Merge pull request #14635 from necromanceranne/blindfold_but_not
Adds fake blindfolds. For reasons.
2021-04-28 21:17:06 -06:00
qweq12yt
3afb801036 huh 2021-04-28 15:41:20 -03:00
SandPoot
5bb6078def upload files 2021-04-22 20:39:21 -03:00
necromanceranne
0a5b587304 Adds fake blindfolds. For reasons. 2021-04-21 12:06:34 +10:00
Lin
c4f2267fd0 Merge pull request #14528 from BlueWildrose/Idungoofed
Fixed being unable to fix suit sensors if damaged at all unless destroyed completely
2021-03-28 18:02:49 -05:00
silicons
a3d0dd6cf1 Merge pull request #14434 from dzahlus/joy
Adds radial skin menu to joy mask, pensive, angry, flushed
2021-03-27 01:35:18 -06:00
Blue Wildrose
f6b3ef0893 probably a better way of setting this up 2021-03-26 20:11:26 -07:00
Blue Wildrose
ac0d261959 can't repair unless absolutely broken no more 2021-03-26 20:03:19 -07:00
Fabian
2c0ffca75c Update miscellaneous.dm 2021-03-25 14:26:18 +01:00
silicons
32797e0446 Merge pull request #14480 from BlueWildrose/sensorydetail
Adds suit sensor damage, clothing damage changes
2021-03-24 19:25:24 -06:00
dzahlus
83102b056b Update miscellaneous.dm 2021-03-24 19:14:52 +01:00
Fabian
eb0973969d Merge branch 'master' into joy 2021-03-23 20:28:09 +01:00
Fabian
989ed923d8 accidental powergame armor removal 2021-03-23 20:02:07 +01:00
Blue Wildrose
bc36e73c7e maybe I should include this check 2021-03-20 06:52:13 -07:00
Blue Wildrose
3a37cc6325 Some sensory detail 2021-03-20 06:37:37 -07:00
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
Fabian
4a5827662c you now get to change your mask at any time not just once 2021-03-13 22:29:05 +01:00
Fabian
1ca1ccfc36 unapologetic joy mask buff 2021-03-13 21:52:23 +01:00