 lolman360
|
55c8250324
|
AAAAAAAAAAAAAAAAA
|
2020-08-28 12:44:59 +10:00 |
|
|
lolman360
|
0ff85deddf
|
Merge remote-tracking branch 'upstream/master' into AnPrimAssistants
|
2020-08-25 01:25:34 +10:00 |
|
|
silicons
|
82d8b7266f
|
Merge pull request #13238 from Hatterhat/insidious-tackle
insidious combat gloves but they can tackle now
|
2020-08-23 17:36:03 -07:00 |
|
|
lolman360
|
f2a7c2599d
|
Merge remote-tracking branch 'upstream/master' into AnPrimAssistants
|
2020-08-24 09:36:36 +10:00 |
|
|
lolman360
|
daeaf81ab6
|
e
|
2020-08-24 01:25:26 +10:00 |
|
|
lolman360
|
0f9f1e240c
|
w
|
2020-08-24 00:51:13 +10:00 |
|
|
lolman360
|
4b2b4afc64
|
e
|
2020-08-24 00:49:31 +10:00 |
|
|
lolman360
|
6463d0b785
|
Merge branch 'AnPrimAssistants' of https://github.com/lolman360/Citadel-Station-13 into AnPrimAssistants
|
2020-08-24 00:27:29 +10:00 |
|
|
lolman360
|
b74c5ba22d
|
ee
|
2020-08-24 00:27:22 +10:00 |
|
|
lolman360
|
460c92de74
|
3
|
2020-08-24 00:20:04 +10:00 |
|
|
lolman360
|
05250939c6
|
e
|
2020-08-23 23:58:04 +10:00 |
|
|
silicons
|
2fa023346a
|
Merge pull request #13204 from timothyteakettle/donator-items
adds three t1 donator items
|
2020-08-23 05:08:50 -07:00 |
|
|
lolman360
|
bc14155632
|
Merge remote-tracking branch 'upstream/master' into AnPrimAssistants
|
2020-08-23 17:01:45 +10:00 |
|
|
lolman360
|
1deafc7103
|
its asking me to commit hold on
|
2020-08-23 17:01:32 +10:00 |
|
|
lolman360
|
2a3ada511e
|
It's all codersprites?
Always has been.
|
2020-08-23 16:51:55 +10: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 |
|
|
Hatterhat
|
8645a2954f
|
tackle hando
|
2020-08-22 16:13:41 -05:00 |
|
|
zerothebigboy
|
5d611155f1
|
a
|
2020-08-21 02:15:30 -04:00 |
|
|
zerothebigboy
|
5741db4a13
|
Merge branch 'thefunnytemporalkatanas' of https://github.com/zeroisthebiggay/Citadel-Station-13 into thefunnytemporalkatanas
# Conflicts:
# code/game/objects/items/weaponry.dm
|
2020-08-21 02:13:44 -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
|
cca7e66457
|
a slight blink flavor
|
2020-08-21 01:54:09 -04:00 |
|
|
zeroisthebiggay
|
a183fb3165
|
Update weaponry.dm
thats an extra space
|
2020-08-21 01:45:23 -04:00 |
|
|
zeroisthebiggay
|
7f036428bd
|
Update weaponry.dm
thats an extra space
|
2020-08-21 01:40:19 -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 |
|
|
lolman360
|
bda2c740ba
|
Merge branch 'master' into AnPrimAssistants
|
2020-08-21 11:08:13 +10:00 |
|
|
Ghommie
|
fde859bca0
|
Removing priority overlays, update_icon() splitup for guns.
|
2020-08-20 18:33:23 +02:00 |
|
|
timothyteakettle
|
46a464d3b8
|
no it also cant be sentient
|
2020-08-19 02:26:08 +01:00 |
|
|
timothyteakettle
|
097851cbc4
|
better name
|
2020-08-19 02:11:08 +01:00 |
|
|
timothyteakettle
|
98baa09005
|
the aforementioned pet changes
|
2020-08-19 01:47:11 +01:00 |
|
|
Timothy Teakettle
|
19dce2263d
|
that too
|
2020-08-18 17:49:01 +01:00 |
|
|
Timothy Teakettle
|
945ac02152
|
small error
|
2020-08-18 17:48:10 +01:00 |
|
|
Timothy Teakettle
|
6392367df4
|
donator items
|
2020-08-18 17:28:09 +01:00 |
|
|
lolman360
|
e00c383b1a
|
Update belt.dm
|
2020-08-18 20:19:54 +10:00 |
|
|
lolman360
|
4e23559065
|
Update sheet_types.dm
|
2020-08-18 18:15:24 +10:00 |
|
|
lolman360
|
8085ab01d9
|
culst!
|
2020-08-18 15:38:59 +10:00 |
|
|
lolman360
|
8f5078a15a
|
Update mineral.dm
|
2020-08-18 14:47:47 +10:00 |
|
|
lolman360
|
bb86003510
|
w e w
|
2020-08-18 10:04:52 +10:00 |
|
|
silicons
|
8dedcbcf76
|
Merge branch '13113'
|
2020-08-16 18:53:35 -07:00 |
|
|
silicons
|
2095e2705f
|
Merge branch '13169'
|
2020-08-16 18:52:13 -07:00 |
|
|
silicons
|
a900c07846
|
Merge branch '13163'
|
2020-08-16 18:51:24 -07:00 |
|
|
silicons
|
44e2327280
|
Merge branch '13143'
|
2020-08-16 18:47:48 -07:00 |
|
|
silicons
|
9c63a09907
|
Merge branch 'pr-13087'
|
2020-08-16 18:40:07 -07:00 |
|
|
silicons
|
01dd2f389b
|
Merge branch 'pr-13067'
|
2020-08-16 18:38:13 -07:00 |
|
|
Lin
|
d287f44d9a
|
Merge pull request #13045 from silicons/coggers
ports bronze (fake clockwork) airlocks and windows
|
2020-08-16 20:20:03 -05:00 |
|
|
Hatterhat
|
bc0ca30647
|
there is no cooldown, press G
|
2020-08-16 15:45:11 -05: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 |
|
|
silicons
|
b2c65e34fc
|
Merge pull request #13157 from kiwedespars/nullrod-nerf
chaplain nullrod nerf
|
2020-08-15 08:00:43 -07:00 |
|
|
lolman360
|
7ca4fa2f55
|
compilies/??
|
2020-08-15 17:09:12 +10:00 |
|