kevinz000
|
c29e0e1a1d
|
Merge pull request #10596 from Seris02/hijackbackup
Hijack Implant
|
2020-02-10 04:16:14 -07:00 |
|
kevinz000
|
5d2b2d7fbf
|
Merge pull request #10971 from Trilbyspaceclone/disco_baby
Adds more Alien disco
|
2020-02-10 04:14:18 -07:00 |
|
Ghom
|
c7614958bc
|
Merge pull request #10937 from Arturlang/debug_outfit_updates
Updates the debug outfit
|
2020-02-09 22:49:22 +01:00 |
|
Ghom
|
c2baad44d8
|
Merge pull request #10277 from kevinz000/god_wish_your_plushies_holy_shit
ENDS THE PLUSHIE DRAMA
|
2020-02-09 21:47:30 +01:00 |
|
Arturlang
|
29207b22fb
|
Merge branch 'master' into debug_outfit_updates
|
2020-02-09 22:05:26 +02:00 |
|
TrilbySpaceClone
|
76219e0188
|
Primortial
|
2020-02-08 02:21:14 -05:00 |
|
Seris02
|
4ec99a38e2
|
merge fixes
|
2020-02-07 15:28:05 +08:00 |
|
kevinz000
|
de2a3c5502
|
Merge pull request #10787 from Seris02/snatchgloves
thief's gloves
|
2020-02-06 23:53:54 -07:00 |
|
Artur
|
c9dc35fd9a
|
Updates the debug outfit
|
2020-02-06 18:42:23 +01:00 |
|
Seris02
|
d0100345fd
|
done hopefully
|
2020-02-05 17:00:38 +08:00 |
|
Seris02
|
6cc6aa12be
|
yeehaw it's done
|
2020-02-05 16:54:57 +08:00 |
|
TrilbySpaceClone
|
06fd6645b3
|
And it wokrs
|
2020-02-04 16:01:22 -05:00 |
|
kevinz000
|
8910efadfa
|
Merge remote-tracking branch 'citadel/master' into god_wish_your_plushies_holy_shit
|
2020-02-03 13:07:49 -07:00 |
|
Ghommie
|
a365f3b499
|
Demodularize and nerfs mag rifles with re(?)added power cell requirements.
|
2020-02-03 05:16:32 +01:00 |
|
kevinz000
|
c94b5688db
|
Merge pull request #10810 from YakumoChen/ring
Adds ring jewelry
|
2020-02-02 03:16:01 -07:00 |
|
kevinz000
|
2cdf7fa0bb
|
Merge pull request #10784 from Seris02/polycoats
polychromic winter coats
|
2020-02-02 01:46:58 -07:00 |
|
kevinz000
|
3fc832fbe7
|
Merge pull request #10819 from Ghommie/Ghommie-cit541
clown ops infiltrator consistency.
|
2020-02-02 01:39:08 -07:00 |
|
Seris02
|
18489e5b65
|
merge fixes
|
2020-02-02 11:51:26 +08:00 |
|
Ghom
|
3337181cac
|
Merge pull request #10352 from Seris02/smchanges
Changes to the way SM handles power related to integrity and max integrity damage
|
2020-02-01 18:46:10 +01:00 |
|
YakumoChen
|
0d1d90cc96
|
bigger rings
|
2020-01-31 19:23:59 -05:00 |
|
Ghommie
|
ab4aa29576
|
clown ops infiltrator consistency.
|
2020-02-01 00:02:31 +01:00 |
|
YakumoChen
|
7b1af64a31
|
update ring.dmi
|
2020-01-31 08:50:55 -05:00 |
|
Ghom
|
15e5f0ef5d
|
Merge pull request #10644 from ShadeAware/master
Craftable Switchblades: The Finale
|
2020-01-30 21:30:55 +01:00 |
|
Seris02
|
bf47daf099
|
MY PRECIOUS! GONE!! GOOOOOONE!!!
|
2020-01-30 17:00:14 +08:00 |
|
Seris02
|
8658783c94
|
icon fixes
|
2020-01-30 15:47:04 +08:00 |
|
Seris02
|
afb4bebf2d
|
merge conflicts
|
2020-01-30 12:47:48 +08:00 |
|
Ghom
|
f74475a6e0
|
Merge pull request #10749 from kevinz000/duke_moxley
It's high noon...
|
2020-01-30 00:19:37 +01:00 |
|
Seris02
|
1a40bec44b
|
merge maybe fix
|
2020-01-29 18:45:21 +08:00 |
|
Seris02
|
e6f8f478d7
|
prototype
|
2020-01-29 18:43:15 +08:00 |
|
Ghommie
|
5875f2578c
|
demodularize and removes lot of unused clothing with missing sprites.
|
2020-01-28 02:32:46 +01:00 |
|
kevinz000
|
d4d315b447
|
:^)
|
2020-01-27 02:51:01 -07:00 |
|
Seris02
|
e45cc4933c
|
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into hijackbackup
|
2020-01-27 08:33:38 +08:00 |
|
ShadeAware
|
e75807430b
|
Adds Makeshift Sprites and Fancy Sprites; Fancy Crafting
Not actually crafting but you get the idea. This won't compile haha.
|
2020-01-26 15:53:37 -05:00 |
|
kevinz000
|
2e6cfef224
|
Merge remote-tracking branch 'citadel/master' into god_wish_your_plushies_holy_shit
|
2020-01-25 22:13:28 -07:00 |
|
Ghom
|
8983f89a75
|
Merge pull request #10693 from Seris02/conveyorbetterness
makes conveyor directions a bit easier to see
|
2020-01-25 04:08:11 +01:00 |
|
kevinz000
|
ea9513864d
|
Merge pull request #10674 from Xantholne/lunar01
Culturally Appropriate Lunar Clothes
|
2020-01-24 16:14:32 -07:00 |
|
Ghom
|
d5daae98c7
|
Merge pull request #9905 from Trilbyspaceclone/glassware
[Ready] Cargo MK III - Glassware Addtion
|
2020-01-24 18:46:25 +01:00 |
|
Seris02
|
17c1d649a6
|
makes conveyor directions a bit easier to see
|
2020-01-24 18:27:05 +08:00 |
|
Seris02
|
90c7149d8c
|
merge conflict fixes
|
2020-01-24 10:27:48 +08:00 |
|
Seris02
|
4fec6bcb7e
|
there
|
2020-01-24 10:26:38 +08:00 |
|
Trilbyspaceclone
|
9466b0f4ca
|
Merge branch 'master' into glassware
|
2020-01-23 13:31:04 -05:00 |
|
Unknown
|
bd8ce9a7b6
|
Culturally Appropriate Lunar Clothes
|
2020-01-23 06:35:50 -07:00 |
|
kevinz000
|
1b7265d8c1
|
Merge pull request #10605 from r4d6/Layer
Port TG Layers updates and Freezer update
|
2020-01-23 04:46:52 -07:00 |
|
Seris02
|
934c8fe533
|
updates + thingamajig
|
2020-01-23 15:25:45 +08:00 |
|
ShadeAware
|
ff9070fa9d
|
Revert "Delete glasses.dmi"
This reverts commit 413bfc276e.
|
2020-01-21 19:04:57 -05:00 |
|
ShadeAware
|
61d9e0d877
|
Revert "Add files via upload"
This reverts commit 50d3b4b78e.
|
2020-01-21 19:04:54 -05:00 |
|
ShadeAware
|
50d3b4b78e
|
Add files via upload
|
2020-01-21 18:45:54 -05:00 |
|
ShadeAware
|
413bfc276e
|
Delete glasses.dmi
|
2020-01-21 18:45:44 -05:00 |
|
Seris02
|
c2bcbe868e
|
merge conflicts + getting rid of commented code for now
|
2020-01-21 11:23:33 +08:00 |
|
kevinz000
|
12c832b40b
|
Merge remote-tracking branch 'citadel/master' into god_wish_your_plushies_holy_shit
|
2020-01-20 17:53:06 -07:00 |
|