 nik707
|
c826e1b412
|
Merge pull request #9175 from lolman360/master
[READY] Adds durathread jumpskirts, rolled down jumpsuits and PROBABLY FIXES SPRITES
|
2019-08-31 02:06:33 -05:00 |
|
|
Sishen
|
05a8c3bb20
|
aaaaaaa
|
2019-08-23 14:47:19 -04:00 |
|
|
Sishen
|
3f86a92efa
|
Merge branch 'walk-like-an-egyptian' into walklikeanegyptian
|
2019-08-23 14:42:35 -04:00 |
|
|
lolman360
|
379674e849
|
Durasprites for real.
|
2019-08-22 14:17:52 +10:00 |
|
|
deathride58
|
fc2fdf71ca
|
Merge pull request #9164 from lolman360/sprites
lolman fucks up his first pr
|
2019-08-21 11:17:39 -04:00 |
|
|
Sishen
|
7c23b45fba
|
Update suit.dmi
|
2019-08-20 00:46:43 -04:00 |
|
|
Sishen
|
4ae0051b30
|
Update suit.dmi
|
2019-08-20 00:45:47 -04:00 |
|
|
lolman360
|
8811164b0a
|
ssssssEEEEEEEEEEEEEEEE
|
2019-08-20 10:20:31 +10:00 |
|
|
lolman360
|
9cf17372a9
|
digi ones left
|
2019-08-20 09:58:49 +10:00 |
|
|
lolman360
|
ceddd83e63
|
ddddddddd
|
2019-08-20 09:55:16 +10:00 |
|
|
lolman360
|
7ce942e69a
|
actual retard
|
2019-08-20 09:32:01 +10:00 |
|
|
Sishen
|
7a8e2c3f50
|
rebalances the lawyer heirloom briefcase while giving it a fancy new sprite
|
2019-08-19 17:54:16 -04:00 |
|
|
Sishen
|
8cf423b899
|
fixed merge issues
|
2019-08-19 14:36:40 -04:00 |
|
|
Sishen
|
ed2c3f3cbd
|
Fixes spelling mistakes, adds pharaoh gear to chaplain vendor
|
2019-08-19 13:53:05 -04:00 |
|
|
kevinz000
|
47dd8d22eb
|
Merge pull request #9149 from Trilbyspaceclone/padding_and_such
Adds Tatical armor to IAA/Synda uplinks as well as some armor accessorys
|
2019-08-18 23:37:56 -07:00 |
|
|
TrilbySpaceClone
|
e69d27f9eb
|
Traitor armor
|
2019-08-17 20:36:47 -04:00 |
|
|
lolman360
|
e838da8039
|
Merge pull request #3 from Citadel-Station-13/master
3
|
2019-08-17 11:55:56 +10:00 |
|
|
Jay
|
f17aea268c
|
Donator item
|
2019-08-11 01:07:20 -05:00 |
|
|
BlackMajor
|
5dcd419d8a
|
Merge pull request #8356 from Thalpy/master
[READY] FermiChem! Adds a new reaction mechanic, 9 new chems and a few extra features to accommodate the new chems.
|
2019-08-11 16:09:23 +12:00 |
|
|
lolman360
|
5d78cf394b
|
yeet those files up to the hub of git
|
2019-08-11 11:56:20 +10:00 |
|
|
Linzolle
|
9a5863a526
|
minor tweak
|
2019-08-07 00:06:10 -05:00 |
|
|
Linzolle
|
41feed5f7e
|
adds rainbow knife inhands icon, also makes knife the same shade of grey when held in either hand.
|
2019-08-06 23:50:00 -05:00 |
|
|
Thalpy
|
5795f6bbe2
|
Merge branch 'master' into master
|
2019-08-05 09:09:36 +01:00 |
|
|
kevinz000
|
b292bc7187
|
Merge pull request #9007 from Ghommie/Ghommie-cit168
Fixes and standarizes sword sheaths/scabbards overlays.
|
2019-08-05 00:49:49 -07:00 |
|
|
kevinz000
|
4f0dc33d1b
|
Merge pull request #9021 from Ghommie/Ghommie-cit174
Ports "Adds techpriest robes and adds them to the RoboDrobe"
|
2019-08-05 00:49:29 -07:00 |
|
|
kevinz000
|
489b4c78dc
|
Merge pull request #8996 from Ghommie/Ghommie-cit166
Adds in worn overlays for different types of cuffs.
|
2019-08-04 19:19:19 -07:00 |
|
|
Ghommie
|
7c9c51b777
|
Ports "Adds techpriest robes and adds them to the RoboDrobe"
|
2019-07-31 21:54:55 +02:00 |
|
|
Ghommie
|
b000aa4673
|
Fixes the dark sabre donator item.
|
2019-07-31 13:06:51 +02:00 |
|
|
Fermi
|
c36f9e2596
|
Fixing merge conflicts.
|
2019-07-29 23:04:10 +01:00 |
|
|
Fermi
|
fbbc4d8589
|
Merge branch 'pr/21'
|
2019-07-29 22:57:40 +01:00 |
|
|
Michiyamenotehifunana
|
94fa4aa6d5
|
Merge branch 'master' into Rapid-Resprite-Service
|
2019-07-29 21:15:46 +08:00 |
|
|
kevinz000
|
7ab0b28c2c
|
Merge pull request #8956 from CameronWoof/backpack-icons
Updates inventory plates
|
2019-07-29 05:02:34 -07:00 |
|
|
kevinz000
|
c1092c0f48
|
Merge pull request #8974 from EgoSumStultus/blood-gun-sprite-fix
Fixes the blood chiller's inhand sprite
|
2019-07-29 04:39:39 -07:00 |
|
|
kevinz000
|
156d525897
|
Merge pull request #8984 from Ghommie/Ghommie-cit162
allows the captain sabre sheat to hold stunswords.
|
2019-07-29 04:37:21 -07:00 |
|
|
Ghommie
|
51a715e779
|
.
|
2019-07-29 04:50:47 +02:00 |
|
|
Ghommie
|
4ef1413342
|
dupe icons instead of snowflake vars.
|
2019-07-29 04:50:12 +02:00 |
|
|
Ghommie
|
2b224400e3
|
Adds in worn overlays for different types of cuffs.
|
2019-07-29 04:31:27 +02:00 |
|
|
Fermi
|
d080446a77
|
Merge branch 'pr/20'
|
2019-07-28 23:28:19 +01:00 |
|
|
Ghommie
|
a9e1fadcd4
|
allows the captain sabre sheat to hold stunswords.
|
2019-07-27 22:47:36 +02:00 |
|
|
BlackMajor
|
b5ab3c1783
|
Merge pull request #8972 from Fractious/portTGNVG
Port TG new NVGs sprites
|
2019-07-28 01:55:06 +12:00 |
|
|
CameronWoof
|
8175f5d0a7
|
transparency pass
|
2019-07-26 02:21:43 -07:00 |
|
|
EgoSumStultus
|
fe4459d0a0
|
fixes blood gun sprite
|
2019-07-26 01:12:59 -07:00 |
|
|
Fractious
|
ba6c18c883
|
Port TG new NVGs
QOL porting these 3 new sprites for the Sec NVG, Med NVG and Diag NVG. Why not?
|
2019-07-25 22:00:25 -04:00 |
|
|
Sishen
|
68083aa0c6
|
a
|
2019-07-25 21:43:02 -04:00 |
|
|
Sishen
|
612021b9d5
|
h
|
2019-07-25 21:43:02 -04:00 |
|
|
CameronWoof
|
f7063e78d8
|
Updates inventory plates
|
2019-07-24 03:50:14 -07:00 |
|
|
Michiyamenotehifunana
|
2845cb2e7d
|
Resprites RCDs and RPDs
|
2019-07-23 20:23:45 +08:00 |
|
|
kevinz000
|
f114094138
|
Merge pull request #8926 from Thalpy/Secbats
Secbats
|
2019-07-22 20:15:36 -07:00 |
|
|
Thalpy
|
15ab1a26a4
|
Merge branch 'master' into master
|
2019-07-21 01:50:41 +01:00 |
|
|
Fermi
|
4ab5060596
|
Adds secbats (tested)
|
2019-07-19 17:07:02 +01:00 |
|