lolman360
|
05250939c6
|
e
|
2020-08-23 23:58:04 +10: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 |
|
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 |
|
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
|
f611945b34
|
Merge pull request #13180 from Detective-Google/glass-floors
ports multiz glass floors (tgstation/tgstation#50831)
|
2020-08-17 03:14:15 -07:00 |
|
Putnam3145
|
23b4ba3714
|
Merge pull request #13063 from silicons/supermatter
Ports /tg/ supermatter - no more infinite stunlock death on charge inertia delaminations
|
2020-08-17 03:13:14 -07: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
|
397cdb6c03
|
Merge branch '13129'
|
2020-08-16 18:45:35 -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 |
|
Detective Google
|
016fd2ac3c
|
woo yeah yeah woo
|
2020-08-15 23:55:52 -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 |
|
Letter N
|
15a1ffde52
|
fix
|
2020-08-15 09:46:50 +08:00 |
|
Detective Google
|
83e1b4f0df
|
woo yeah yeah woo
|
2020-08-14 15:07:22 -05:00 |
|
kiwedespars
|
61486f1287
|
adds custom parry data.
|
2020-08-14 01:59:46 -07:00 |
|
kiwedespars
|
53be29d9c2
|
Update dualsaber.dm
|
2020-08-14 01:43:47 -07:00 |
|
Hatterhat
|
d5b788a655
|
shortparry window restored, glaive parry req wield
|
2020-08-12 23:33:59 -05:00 |
|
Letter N
|
833aa86795
|
comment removal
|
2020-08-13 12:15:53 +08:00 |
|
Letter N
|
8c26b883e9
|
open on init
|
2020-08-13 11:44:35 +08:00 |
|
Letter N
|
5727add7ab
|
commit name
|
2020-08-13 11:41:33 +08:00 |
|
Letter N
|
1f2d9ca2ef
|
jar moment
|
2020-08-12 19:35:24 +08:00 |
|
silicons
|
3e67fd11e8
|
Update chair.dm
|
2020-08-11 23:39:31 -07:00 |
|
lolman360
|
6f7badda41
|
Merge branch 'master' into plumb
|
2020-08-12 09:03:11 +10:00 |
|
ancientpower
|
99d73388f8
|
lets ghosts see the contents of closets
|
2020-08-11 16:40:03 -05: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
|
82824f9fb9
|
Merge pull request #13100 from lolzalolka/lean2
Suture/Mesh Crafting (take2)
|
2020-08-11 01:40:50 -07:00 |
|