silicons
|
7f942abef2
|
Merge pull request #13239 from zeroisthebiggay/fetishglovesbelike
zero adds black fetish gloves because hes Horny
|
2020-08-23 05:08:14 -07:00 |
|
silicons
|
7737e76b32
|
Merge pull request #13224 from Ghommie/Ghommie-cit835
Removing priority overlays, update_icon() splitup for guns.
|
2020-08-22 15:19:07 -07:00 |
|
zerothebigboy
|
21836b4ec8
|
: )
|
2020-08-22 18:11:03 -04:00 |
|
zerothebigboy
|
5df58b3ca6
|
a
|
2020-08-21 02:24:43 -04:00 |
|
zerothebigboy
|
cafeb6ab14
|
a
|
2020-08-21 02:12:09 -04:00 |
|
zerothebigboy
|
6fb537e712
|
a
|
2020-08-21 02:12:01 -04:00 |
|
zerothebigboy
|
a9abdeb044
|
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into thefunnytemporalkatanas
|
2020-08-21 02:10:03 -04:00 |
|
zerothebigboy
|
421e32f3f9
|
a final touch up
|
2020-08-21 02:06:36 -04:00 |
|
zerothebigboy
|
b960f4055d
|
a
|
2020-08-21 01:31:30 -04:00 |
|
silicons
|
120bcfc00c
|
Merge pull request #13178 from lolman360/plumb
[READY] ports plumbing (no more waiting for tgui4)
|
2020-08-20 21:32:26 -07:00 |
|
Ghommie
|
fde859bca0
|
Removing priority overlays, update_icon() splitup for guns.
|
2020-08-20 18:33:23 +02:00 |
|
silicons
|
56d49aac2e
|
Merge pull request #13186 from Detective-Google/telebort
a few snaxi improvements; chiefly labelling the telepads better.
|
2020-08-17 03:15:37 -07:00 |
|
Detective Google
|
83332453b6
|
clarifies a bit more where each pad goes on snaxi.
|
2020-08-16 21:01:09 -05:00 |
|
silicons
|
8dedcbcf76
|
Merge branch '13113'
|
2020-08-16 18:53:35 -07:00 |
|
silicons
|
b767c99bac
|
Merge branch '13144'
|
2020-08-16 18:48:14 -07:00 |
|
silicons
|
fe7d8860f5
|
Merge branch '13124'
|
2020-08-16 18:45:23 -07:00 |
|
Navier
|
fc70d3dde2
|
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into DRAKEBORG
|
2020-08-15 23:13:41 -04:00 |
|
Letter N
|
66c0f22d33
|
fixes missing icons
|
2020-08-14 21:21:43 +08:00 |
|
Hatterhat
|
ddb6071f43
|
unscuffs the window
|
2020-08-12 23:48:02 -05:00 |
|
Hatterhat
|
826e0c4647
|
todo: fix "window", wonder why passthrow isnt working
|
2020-08-12 22:44:52 -05:00 |
|
lolman360
|
6f7badda41
|
Merge branch 'master' into plumb
|
2020-08-12 09:03:11 +10:00 |
|
The0bserver
|
219709c9cb
|
Yes, some tea.
|
2020-08-11 05:53:24 -04:00 |
|
The0bserver
|
5c6c298547
|
COOL PLANT FACTS:GARLIC WAS IN GROWING.DMI
|
2020-08-11 05:14:02 -04:00 |
|
silicons
|
a8d61b60ef
|
Merge pull request #13011 from timothyteakettle/insane-shot-eyepatch
adds a cybernetic eyepatch to the syndicate uplink
|
2020-08-11 01:47:32 -07:00 |
|
silicons
|
c1d8d1d439
|
Merge pull request #13090 from lolzalolka/lean
Added Burek to Space
|
2020-08-11 01:42:58 -07:00 |
|
silicons
|
5694923d89
|
Merge pull request #13095 from lolman360/liver
custom name/desc ring and necklace
|
2020-08-11 01:41:48 -07:00 |
|
silicons
|
035422ed7f
|
Merge pull request #13098 from LetterN/ToS-component
Mafia Component
|
2020-08-11 01:41:13 -07:00 |
|
Letter N
|
5845684a04
|
icongone
|
2020-08-11 15:56:27 +08:00 |
|
lolman360
|
c18f0defd8
|
medi8el
|
2020-08-11 16:44:08 +10:00 |
|
kiwedespars
|
eb8574d6d6
|
heretics from tg (with changes)
|
2020-08-10 19:17:26 -07:00 |
|
lolman360
|
957b3948bd
|
aare
|
2020-08-10 20:26:32 +10:00 |
|
Letter N
|
a4040ace26
|
hewwo have you tried to work?
|
2020-08-10 10:50:07 +08:00 |
|
chrisbbbbbbb
|
e8ac70696f
|
new food idk?
|
2020-08-09 18:58:32 +02:00 |
|
Letter N
|
bfba7307ec
|
fix
|
2020-08-09 21:29:08 +08:00 |
|
lolman360
|
308d77da7c
|
Merge branch 'master' into plumb
|
2020-08-09 22:48:18 +10:00 |
|
silicons
|
f20f01cc6b
|
Merge pull request #12853 from LetterN/TGUI-4
TGUI4 port
|
2020-08-09 05:46:21 -07:00 |
|
Letter N
|
f1c4a7f6ac
|
Merge remote-tracking branch 'origin/master' into TGUI-4
|
2020-08-09 14:54:16 +08:00 |
|
lolman360
|
50448549fb
|
ee
|
2020-08-09 15:26:08 +10:00 |
|
Putnam
|
9bb3ba5c5a
|
added ethereals
|
2020-08-08 00:08:43 -07:00 |
|
silicons
|
1586625e6b
|
Merge pull request #12960 from timothyteakettle/loadout-you-say
loadout changes part 1: adds subcategories to the loadout
|
2020-08-06 21:59:13 -07:00 |
|
silicons
|
6876edbd85
|
Merge pull request #12992 from Hatterhat/rifle-book-pt2
unatomic as shit PR about nukie guns
|
2020-08-06 19:40:09 -07:00 |
|
silicons
|
009f0ebeeb
|
Merge pull request #13013 from DeltaFire15/newnew-clock-misc-stuff
N tvsg sebz Nezbere (or: a bunch of clockcult related stuff)
|
2020-08-06 19:37:30 -07:00 |
|
Letter N
|
333ca2cc7b
|
Merge remote-tracking branch 'origin/master' into TGUI-4
|
2020-08-06 18:26:04 +08:00 |
|
silicons
|
bb8dfa9236
|
Merge pull request #12991 from b1tt3r1n0/I'mAlreadyTracer
I wanna be tracer
|
2020-08-05 15:26:37 -07:00 |
|
silicons
|
4720fedce9
|
Merge pull request #13003 from Hatterhat/crusher-glaive
Proto-Kinetic Glaives - a crusher reskin
|
2020-08-05 15:25:48 -07:00 |
|
Hatterhat
|
aa10c17b52
|
slight tweak pt2
|
2020-08-05 16:56:02 -05:00 |
|
Letter N
|
f2f6416105
|
fixes - radio, broken - crewmanifest, gastank controler
|
2020-08-05 20:34:09 +08:00 |
|
Hatterhat
|
5f7d70f7d0
|
handguard tweak
|
2020-08-05 07:05:15 -05:00 |
|
DeltaFire
|
2a197af1c0
|
Merge remote-tracking branch 'upstream/master' into newnew-clock-misc-stuff
|
2020-08-04 17:30:38 +02:00 |
|
DeltaFire
|
a2155f9e91
|
more codersprite
clockie arm implants now have a somewhat different looking sprite (totally not just a normal arm implant recolor)
|
2020-08-03 22:13:50 +02:00 |
|