 lolman360
|
d45ac6323a
|
Update smithed_items.dm
|
2020-08-24 00:09:58 +10:00 |
|
|
lolman360
|
289280f0ec
|
Update recipes_misc.dm
|
2020-08-24 00:00:39 +10:00 |
|
|
lolman360
|
05250939c6
|
e
|
2020-08-23 23:58:04 +10:00 |
|
|
lolman360
|
ccf8aaf412
|
ee
|
2020-08-23 23:53:38 +10:00 |
|
|
lolman360
|
ce2dca5932
|
Update anvil.dm
|
2020-08-23 22:19:25 +10:00 |
|
|
lolman360
|
e138536cb6
|
eee eee eee
|
2020-08-23 18:29:01 +10:00 |
|
|
lolman360
|
c8ecfdf4a9
|
Update anvil.dm
|
2020-08-23 17:50:33 +10:00 |
|
|
lolman360
|
04a755746b
|
oh yeah
|
2020-08-23 17:45:13 +10:00 |
|
|
lolman360
|
73932b27d2
|
TESTMERGE TIME?
|
2020-08-23 17:43:34 +10:00 |
|
|
lolman360
|
220546b558
|
you forgot the knife idiot
|
2020-08-23 17:19:30 +10:00 |
|
|
lolman360
|
ce4d50b9a9
|
E
|
2020-08-23 17:09:13 +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 |
|
|
lolman360
|
1146ed0d1f
|
is thsi it
|
2020-08-23 13:12:51 +10:00 |
|
|
silicons
|
188bb13272
|
Merge pull request #13181 from Putnam3145/dynnamic
Dynamic: tweaks and fixes: the reckoning
|
2020-08-22 15:22:19 -07:00 |
|
|
silicons
|
c7c74e7c51
|
Merge pull request #13213 from lolman360/breath
breath mask balaclava
|
2020-08-22 15:22:04 -07:00 |
|
|
silicons
|
876dc36dbc
|
Merge pull request #13201 from kiwedespars/return-the-punch
makes it so you can craft armwraps roundstart again.
|
2020-08-22 15:21:22 -07:00 |
|
|
silicons
|
68ee7b12bf
|
Merge pull request #13236 from timothyteakettle/lizard-fixes
lizards are shitcode
|
2020-08-22 15:19:48 -07:00 |
|
|
silicons
|
a4aeb38433
|
Merge pull request #13221 from Ludox235/fuck-lowpop-xenos
>10 pop xenos >FOR (ALLEGEDLY) 5 YEARS
|
2020-08-22 15:19:21 -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 |
|
|
silicons
|
5c09004dc1
|
Merge pull request #13228 from DeltaFire15/apc-ui-access-fixes
Fixes silicons and ratvarians accessing APCs
|
2020-08-22 15:19:00 -07:00 |
|
|
Timothy Teakettle
|
60c8dd283e
|
shitcode begone
|
2020-08-22 20:02:36 +01:00 |
|
|
kiwedespars
|
055d397e1e
|
adds tape
|
2020-08-21 13:34:02 -07:00 |
|
|
DeltaFire
|
bf799472d1
|
fixes the APC access check
|
2020-08-21 19:35:58 +02: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
|
623fe1cb69
|
Update recipes_clothing.dm
|
2020-08-21 12:00:09 +10:00 |
|
|
lolman360
|
bda2c740ba
|
Merge branch 'master' into AnPrimAssistants
|
2020-08-21 11:08:13 +10:00 |
|
|
Ghom
|
cd10655985
|
fix 2
|
2020-08-20 23:02:13 +02:00 |
|
|
Timothy Teakettle
|
88fb9d277a
|
fix lizard snouts (#13223)
|
2020-08-20 22:58:54 +02:00 |
|
|
Ghommie
|
c39764afde
|
Merge branch 'Ghommie-cit835' of https://github.com/Ghommie/Citadel-Station-13 into Ghommie-cit835
|
2020-08-20 20:28:46 +02:00 |
|
|
Ghommie
|
921a963e59
|
fix 1
|
2020-08-20 20:26:29 +02:00 |
|
|
Ghom
|
1242626faa
|
Forgot the comment.
|
2020-08-20 19:01:13 +02:00 |
|
|
Ghommie
|
fde859bca0
|
Removing priority overlays, update_icon() splitup for guns.
|
2020-08-20 18:33:23 +02:00 |
|
|
Timothy Teakettle
|
bc16a8f1b2
|
fix lizard snouts
|
2020-08-20 16:39:07 +01:00 |
|
|
Ludox
|
d51af28f77
|
Bumps min-pop to 25
Ahahah 3 years that we can have 10 pop xenos :)
|
2020-08-20 14:39:04 +02:00 |
|
|
silicons
|
11467e1cae
|
Merge pull request #13212 from Putnam3145/reftrack
Ports reftracking from TG.
|
2020-08-19 22:03:16 -07:00 |
|
|
silicons
|
91484356c5
|
Merge pull request #13183 from SmArtKar/shuttle_hotfix
Shuttle hotfix so now you can make huge shuttle things
|
2020-08-19 21:03:58 -07:00 |
|
|
silicons
|
0e2e4fdaf7
|
Merge pull request #13199 from lolman360/haha
[READY] tested code
|
2020-08-19 21:03:21 -07:00 |
|
|
silicons
|
8a1cf1b860
|
Merge pull request #13208 from timothyteakettle/fuck
fixes two snout paths
|
2020-08-19 19:56:12 -07:00 |
|
|
silicons
|
5414a8949c
|
Update text.dm
|
2020-08-19 08:50:26 -07:00 |
|
|
DeltaFire
|
7a9796e782
|
minmax torture
|
2020-08-19 17:05:27 +02:00 |
|