Ghom
|
7b34daae48
|
Merge pull request #10563 from Trilbyspaceclone/patch-268
Makes fragile suit less likely to brake from toys
|
2020-01-15 15:51:15 +01:00 |
|
Hatterhat
|
7b322ff467
|
Merge branch 'master' into greytide-standard-uniform
|
2020-01-14 19:39:16 -06:00 |
|
Trilbyspaceclone
|
5351bc9f8a
|
Update miscellaneous.dm
|
2020-01-14 19:15:35 -05:00 |
|
Ghom
|
5dee355381
|
Merge pull request #10530 from kappa-sama/modularer
deletes modular items but this time i don't get cucked
|
2020-01-15 00:47:38 +01:00 |
|
Ghommie
|
26d6e7f05c
|
Work.
|
2020-01-14 22:04:38 +01:00 |
|
Ghommie
|
3984943b0d
|
[s] makes master compile.
|
2020-01-14 20:02:26 +01:00 |
|
Ghom
|
03ebab6ec5
|
Merge pull request #10454 from Commandersand/clothsfix
fixes clothing directional sprites(i swear not all of them are my fault)
|
2020-01-14 18:24:50 +01:00 |
|
Seris02
|
d46f3232f9
|
tada
|
2020-01-14 10:57:32 +08:00 |
|
Seris02
|
bd2fe8eb01
|
durathread winter coat from hyper
|
2020-01-13 13:12:17 +08:00 |
|
kappa-sama
|
3e199ed780
|
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into modularer
|
2020-01-12 14:23:38 -05:00 |
|
Hatterhat
|
7fac15caeb
|
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into greytide-standard-uniform
|
2020-01-12 12:39:57 -06:00 |
|
AffectedArc07
|
16a37e2769
|
Standardises all files from CRLF to LF
|
2020-01-12 14:28:01 +00:00 |
|
Hatterhat
|
47fd3823e8
|
staff assistant jumpsuit gang
|
2020-01-11 15:58:24 -06:00 |
|
kappa-sama
|
3281db6000
|
scream
|
2020-01-10 22:39:13 -05:00 |
|
kappa-sama
|
5857da02a5
|
cheeki breeki
|
2020-01-10 22:35:30 -05:00 |
|
kappa-sama
|
93fc0b3716
|
xenos helmet
|
2020-01-10 22:34:26 -05:00 |
|
Lin
|
42263a435a
|
Merge pull request #10489 from Seris02/chameleonthing
Fixes and improvements for chameleon clothes
|
2020-01-11 01:12:43 +00:00 |
|
kevinz000
|
8f60099595
|
Merge pull request #10488 from Xantholne/xantholne-cowboy02
Red Dead Redemption 2 but it's a crappy 2D space man game
|
2020-01-10 14:01:06 -08:00 |
|
Lin
|
e5e2e4f012
|
Merge pull request #10329 from Ghommie/Ghommie-cit490
Ports reagents id removal and typepath usage.
|
2020-01-10 01:34:39 +00:00 |
|
Lin
|
c4cb06f8f0
|
Merge pull request #10112 from Ghommie/Ghommie-cit447
Refactors that mess of a code for alternate worn clothing sprites for digitigrade and taurs.
|
2020-01-10 01:31:20 +00:00 |
|
Ghommie
|
825b4f01c2
|
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into Ghommie-cit490
|
2020-01-10 02:26:19 +01:00 |
|
Seris02
|
3f7a0f4b7c
|
fixes chameleon cloak icon
|
2020-01-09 15:07:43 +08:00 |
|
Seris02
|
adfb077a0a
|
chameleon fixes
|
2020-01-09 15:05:46 +08:00 |
|
loginsandylogout
|
709a803f19
|
oops
|
2020-01-08 23:34:43 -06:00 |
|
loginsandylogout
|
02541f1e3e
|
thisis it
|
2020-01-08 23:34:26 -06:00 |
|
loginsandylogout
|
725828b996
|
fixes ti?
|
2020-01-08 22:52:47 -06:00 |
|
loginsandylogout
|
248785dc94
|
aaa
|
2020-01-08 22:45:23 -06:00 |
|
loginsandylogout
|
20948b66bb
|
should hide legs
|
2020-01-08 22:45:23 -06:00 |
|
Commandersand
|
11aab54864
|
oops
|
2020-01-08 22:45:23 -06:00 |
|
Commandersand
|
c2a8c23751
|
fixes
|
2020-01-08 22:45:22 -06:00 |
|
Unknown
|
afc0ca44f2
|
Merge branch 'master' into xantholne-cowboy02
|
2020-01-08 20:35:36 -07:00 |
|
Unknown
|
4773a3e374
|
Fuggin Cowboy Clothes
|
2020-01-08 07:15:42 -07:00 |
|
Ghom
|
d07d436ba2
|
Merge pull request #10384 from Hatterhat/tg-43454-43688-the-one-with-the-cargo
cargo tweaks, new shit, why do digitigrade sprites exist
|
2020-01-06 21:47:15 +01:00 |
|
Ghommie
|
592422ee70
|
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into Ghommie-cit490
|
2020-01-05 22:53:00 +01:00 |
|
Ghom
|
2cbf2a2574
|
Merge pull request #10429 from Trilbyspaceclone/patch-262
Corrects MASON Rig's missing flags
|
2020-01-05 15:09:05 +01:00 |
|
Trilbyspaceclone
|
609f120c28
|
Update hardsuit.dm
|
2020-01-04 22:29:42 -05:00 |
|
Hatterhat
|
186194418e
|
tg 43454+43688 port, tweaks w/ trilby, db crate
|
2020-01-04 01:33:32 -06:00 |
|
Trilbyspaceclone
|
94fb114611
|
Update hardsuit.dm
|
2020-01-04 02:11:23 -05:00 |
|
Ghommie
|
4d06d231f8
|
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into Ghommie-cit490
|
2020-01-02 17:49:01 +01:00 |
|
kevinz000
|
094d225874
|
Merge remote-tracking branch 'citadel/master' into michael_labs
|
2019-12-31 19:54:01 -08:00 |
|
Ghom
|
93e090d229
|
Merge pull request #10309 from Seris02/disablerglasses
disabler sechuds, let the adminbus commence
|
2019-12-31 14:43:39 +01:00 |
|
Ghom
|
775ddb61e6
|
Merge pull request #10301 from Trilbyspaceclone/patch-249
Buffs Engine Goggles a lot!
|
2019-12-30 22:23:46 +01:00 |
|
Ghommie
|
80e716eeaf
|
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into Ghommie-cit447
|
2019-12-30 18:14:47 +01:00 |
|
Ghommie
|
49f1176170
|
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into Ghommie-cit490
|
2019-12-30 16:06:16 +01:00 |
|
Trilbyspaceclone
|
24d4684afb
|
Maybe he means this?
|
2019-12-30 03:56:44 -05:00 |
|
kevinz000
|
24e3b88a34
|
Merge remote-tracking branch 'citadel/master' into michael_labs
|
2019-12-30 00:32:25 -08:00 |
|
kevinz000
|
0dc55b209a
|
Merge pull request #10336 from ItzGabby/Poly-Collar-UI-Fix
Fixes UI for poly collars
|
2019-12-30 00:11:27 -08:00 |
|
kevinz000
|
3f4594d78e
|
Merge pull request #10312 from Commandersand/prayfornoconflictslel
ports rp dresses/pants/chaps, available through loadout or vendors(without breaking my github branch)
|
2019-12-30 00:07:32 -08:00 |
|
kevinz000
|
310d343242
|
Merge pull request #10095 from Ghommie/Ghommie-cit443
Buffs clown ops by removing their clumsiness and adding a new trait to be used in place of several clown role checks.
|
2019-12-30 00:03:21 -08:00 |
|
Trilbyspaceclone
|
1cc4464726
|
Update engine_goggles.dm
|
2019-12-29 15:01:02 -05:00 |
|