TrilbySpaceClone
|
06fd6645b3
|
And it wokrs
|
2020-02-04 16:01:22 -05: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 |
|
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
|
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 |
|
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 |
|
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 |
|
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 |
|
ShadeAware
|
a188f121b4
|
Add files via upload
|
2020-01-20 17:38:15 -05:00 |
|
ShadeAware
|
2d413d8474
|
Delete items_and_weapons.dmi
|
2020-01-20 17:38:01 -05:00 |
|
Ghom
|
b85e752e46
|
Merge pull request #10615 from keronshb/RemoteMoodResearch
Fixes the nanite sprites deleting the game sprites
|
2020-01-20 18:04:31 +01:00 |
|
keronshb
|
ea088680e2
|
Fixed sprites
This should be it, really
|
2020-01-19 19:25:14 -05:00 |
|
keronshb
|
a4f35eed47
|
This should fix the icon
icon fix pt 2, I swear
|
2020-01-19 14:33:41 -05:00 |
|
keronshb
|
6725e99661
|
icon fix pt1
icon fix pt1
|
2020-01-19 14:26:16 -05:00 |
|
Seris02
|
45b844c231
|
more fixes + code improvements
|
2020-01-19 16:48:19 +08:00 |
|
Seris02
|
afe7c15645
|
merge fixes
|
2020-01-19 16:40:45 +08:00 |
|
r4d6
|
5084146400
|
Port
|
2020-01-18 18:46:22 -05:00 |
|
r4d6
|
4e6ad84317
|
Fix conflict
|
2020-01-18 16:05:56 -05:00 |
|
r4d6
|
810556cbb7
|
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into Passive-Vents
|
2020-01-18 16:03:49 -05:00 |
|
Ghom
|
ce2fc37df3
|
Merge pull request #10501 from Putnam3145/more-atmos
Adds a couple relief valves
|
2020-01-18 20:16:30 +01:00 |
|
Kraseo
|
6708607073
|
fixes jelly donuts not having sprinkle sprites, fixes jelly donuts not having berry jelly
|
2020-01-18 15:05:07 +01:00 |
|
Putnam
|
3788bc6676
|
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into more-atmos
|
2020-01-17 21:33:13 -08:00 |
|
kevinz000
|
05e2b6a441
|
Merge pull request #10569 from keronshb/RemoteMoodResearch
Ports the Nanite Remote, Nanite Mood Programs + Rebalance, and the Research Generating Nanites
|
2020-01-17 14:24:13 -07:00 |
|
keronshb
|
69b5164103
|
Merge branch 'master' into RemoteMoodResearch
|
2020-01-16 15:50:11 -05:00 |
|
r4d6
|
755b0fac3c
|
Merge branch 'master' into Passive-Vents
|
2020-01-15 19:15:50 -05:00 |
|
r4d6
|
6045d818d8
|
Add passive vents
|
2020-01-15 19:12:13 -05:00 |
|
r4d6
|
85e71c4d60
|
fix conflicts.
|
2020-01-15 17:18:18 -05:00 |
|