kevinz000
|
49e52eee05
|
Merge pull request #9603 from Ghommie/Ghommie-cit267
Unmodularize lavaknights and emags.
|
2019-10-25 20:12:35 -07:00 |
|
kevinz000
|
da502aa31d
|
Merge pull request #9535 from Ghommie/Ghommie-cit247
Fixing sniper rifles scope datum action oddity.
|
2019-10-24 19:05:25 -07:00 |
|
kevinz000
|
2ae111eaf0
|
Merge pull request #9587 from Ghommie/Ghommie-cit258
Porting components updates and fixing phantom thief component.
|
2019-10-24 18:38:39 -07:00 |
|
Ghommie
|
f035d77b53
|
Slips.
|
2019-10-24 22:50:53 +02:00 |
|
Ghommie
|
f01b5c853f
|
Unmodularize lavaknights.
|
2019-10-24 22:08:36 +02:00 |
|
Ghommie
|
a50606bb67
|
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into Ghommie-cit259
|
2019-10-24 10:10:07 +02:00 |
|
Ghommie
|
4c8d7023c5
|
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into Ghommie-cit258
|
2019-10-24 09:50:20 +02:00 |
|
Ghommie
|
687d452d67
|
#44222, yea sorry for your rework Poojawa.
|
2019-10-23 16:15:26 +02:00 |
|
Ghommie
|
e1928a18f1
|
Porting GetComponent macros removal, and some related changes.
|
2019-10-23 15:04:28 +02:00 |
|
Ghommie
|
fc1f10c97f
|
Porting components updates and fixing phantom thief component.
|
2019-10-23 13:01:31 +02:00 |
|
Poojawa
|
7463bbc001
|
Merge branch 'master' into syntheticbloods
|
2019-10-21 21:06:18 -05:00 |
|
deathride58
|
30eafc305c
|
Merge pull request #9246 from Linzolle/taur
[READY] some missing icons + sprite changes for taur suits
|
2019-10-21 21:19:05 -04:00 |
|
Ghommie
|
e991328087
|
progress
|
2019-10-19 15:02:56 +02:00 |
|
Poojawa
|
ffeae20daa
|
Merge remote-tracking branch 'Citadel-Station-13/master' into syntheticbloods
|
2019-10-18 06:01:52 -05:00 |
|
Linzolle
|
1690596047
|
you asked for this kevin
|
2019-10-16 15:53:11 -05:00 |
|
Poojawa
|
184e81eec0
|
Merge remote-tracking branch 'refs/remotes/Citadel-Station-13/master' into syntheticbloods
|
2019-10-16 01:51:51 -05:00 |
|
kevinz000
|
7187da9e72
|
Merge pull request #9456 from Thalpy/Spookytime
[READY] [Spookytime] Adds Jacqueline the Pumpqueen
|
2019-10-15 23:11:35 -07:00 |
|
Thalpy
|
1eccc93137
|
Oh it's so good
|
2019-10-15 10:44:35 +01:00 |
|
Thalpy
|
1b170fe2b7
|
Costume for meee
|
2019-10-15 10:27:31 +01:00 |
|
Poojawa
|
bcb11a471d
|
Merge remote-tracking branch 'refs/remotes/Citadel-Station-13/master' into syntheticbloods
|
2019-10-13 19:14:16 -05:00 |
|
kevinz000
|
adeb33cdae
|
Merge pull request #9463 from Owai-Seek/minor-fixes
Updating Kinkmate item-list
|
2019-10-13 13:54:26 -07:00 |
|
Poojawa
|
394c947d14
|
Merge remote-tracking branch 'refs/remotes/Citadel-Station-13/master' into syntheticbloods
|
2019-10-11 23:10:45 -05:00 |
|
kevinz000
|
620af601b2
|
Merge pull request #9437 from JTGSZ/clothingrestrictions
Optional Species based clothing restrictions
|
2019-10-11 12:08:57 -07:00 |
|
Winter Flare
|
2bce423ec3
|
Added a -ton- of stuff to the Kinkmate
|
2019-10-10 14:08:14 -04:00 |
|
kevinz000
|
d9ff4235eb
|
Merge pull request #9447 from Ghommie/Ghommie-cit223
No digitigrade plasmaman suits sprites for the time being, thank you.
|
2019-10-10 02:20:45 -07:00 |
|
kevinz000
|
fda64df569
|
Merge pull request #9257 from Thalpy/Blind-quirk-without-anger
[READY] Blind quirk without anger
|
2019-10-10 02:19:17 -07:00 |
|
kevinz000
|
0c9a065096
|
Merge pull request #8401 from Ghommie/Ghommie-cit11
Refactoring Implants' loc n°3
|
2019-10-10 02:09:37 -07:00 |
|
Ghommie
|
c4a8b80851
|
No digitigrade plasmaman suits spriting, thank you.
|
2019-10-08 18:43:40 +02:00 |
|
Poojawa
|
3113074bfb
|
Merge remote-tracking branch 'refs/remotes/Citadel-Station-13/master' into syntheticbloods
|
2019-10-08 02:55:32 -05:00 |
|
JTGSZ
|
30a41292d8
|
left extra letter in comment
|
2019-10-07 18:02:16 -04:00 |
|
JTGSZ
|
7951d87022
|
species clothing restrictions
species clothing restrictions
|
2019-10-07 17:55:16 -04:00 |
|
Ghommie
|
99e9280eaf
|
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into Ghommie-cit178
|
2019-10-07 21:41:04 +02:00 |
|
Linzolle
|
e009a4cc3d
|
Revert "pooj fixed this anyway"
This reverts commit 6ce8db8d7b.
|
2019-10-05 22:15:48 -05:00 |
|
Ghommie
|
32a73b24c0
|
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into Ghommie-cit11
|
2019-10-05 18:22:43 +02:00 |
|
Linzolle
|
4fc9385e44
|
oops
|
2019-10-05 10:40:31 -05:00 |
|
Linzolle
|
6ce8db8d7b
|
pooj fixed this anyway
|
2019-10-05 10:38:17 -05:00 |
|
Poojawa
|
0482973e8f
|
Merge remote-tracking branch 'refs/remotes/Citadel-Station-13/master' into syntheticbloods
|
2019-10-01 22:38:12 -05:00 |
|
Fermi
|
4b6d996416
|
Merge branch 'master' into Blind-quirk-without-anger
|
2019-10-01 08:41:12 +01:00 |
|
kevinz000
|
250c6ed986
|
Merge pull request #9367 from Poojawa/totally-radical
Totally RADical. Rad levels for Medhud, radiation flags added to storage, suits.
|
2019-10-01 00:12:32 -07:00 |
|
Poojawa
|
9bd6f83034
|
Applies rad_flags to a lot of common items + bluespace bags
Also applies fireproofing to Captain's bag. Eng Sachel /duffle get it too for consistency.
|
2019-09-28 03:22:17 -05:00 |
|
Poojawa
|
f57bdc39a2
|
I still fucking hate components.
|
2019-09-23 02:03:37 -05:00 |
|
Poojawa
|
5876a235c2
|
Merge remote-tracking branch 'refs/remotes/Citadel-Station-13/master' into syntheticbloods
|
2019-09-22 00:22:18 -05:00 |
|
kevinz000
|
5608d37fd5
|
Merge pull request #9263 from Trilbyspaceclone/batter_up
Adds a new traitor bundle - Synda Major Leage Player
|
2019-09-21 01:56:41 -07:00 |
|
kevinz000
|
3e899e59f9
|
Merge pull request #9283 from Trilbyspaceclone/removal
Removes a lot of unused files
|
2019-09-21 01:45:11 -07:00 |
|
kevinz000
|
f259d98d7a
|
Merge pull request #9282 from Ghommie/Ghommie-cit193
Fixed a few dozen suits' body coverage inconsistencies.
|
2019-09-21 01:43:52 -07:00 |
|
Ghommie
|
300c572886
|
Added work boots and bananium clown shoes inhands, more fixes. ready.
|
2019-09-15 18:21:48 +02:00 |
|
Ghommie
|
89360c3574
|
Fixes clown shoes and work boots.
|
2019-09-15 17:56:20 +02:00 |
|
Poojawa
|
53895106dc
|
Merge remote-tracking branch 'refs/remotes/Citadel-Station-13/master' into syntheticbloods
|
2019-09-13 12:58:02 -05:00 |
|
kevinz000
|
c4f5ce67b8
|
Merge pull request #9276 from Trilbyspaceclone/war_on_fashen
Adds clip on pokadoted pants, only in 4 types for now
|
2019-09-13 10:43:00 -07:00 |
|
TrilbySpaceClone
|
626e525d24
|
..?
|
2019-09-12 23:36:59 -04:00 |
|