Commit Graph

1502 Commits

Author SHA1 Message Date
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
Fabian
bb4459ef5e flushed pensive angry 2021-03-13 21:24:29 +01:00
Fabian
036ba24545 flooshed? 2021-03-13 20:17:01 +01: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