 lolman360
|
1f576dfd12
|
Update smithed_items.dm
|
2020-08-24 00:15:27 +10:00 |
|
|
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 |
|
|
Changelogs
|
45d3157983
|
Automatic changelog compile [ci skip]
|
2020-08-23 00:15:13 +00:00 |
|
|
CitadelStationBot
|
b791a3e701
|
Automatic changelog generation for PR #13181 [ci skip]
|
2020-08-22 17:22:22 -05:00 |
|
|
silicons
|
188bb13272
|
Merge pull request #13181 from Putnam3145/dynnamic
Dynamic: tweaks and fixes: the reckoning
|
2020-08-22 15:22:19 -07:00 |
|
|
CitadelStationBot
|
d9f5e13dba
|
Automatic changelog generation for PR #13213 [ci skip]
|
2020-08-22 17:22:07 -05:00 |
|
|
silicons
|
c7c74e7c51
|
Merge pull request #13213 from lolman360/breath
breath mask balaclava
|
2020-08-22 15:22:04 -07:00 |
|
|
CitadelStationBot
|
b0b4e47082
|
Automatic changelog generation for PR #13201 [ci skip]
|
2020-08-22 17:21:24 -05: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 |
|
|
CitadelStationBot
|
1e6d950c1b
|
Automatic changelog generation for PR #13203 [ci skip]
|
2020-08-22 17:21:12 -05:00 |
|
|
silicons
|
e24064afa8
|
Merge pull request #13203 from MrJWhit/final-teg-fixups
Prettying up the TEG
|
2020-08-22 15:21:09 -07:00 |
|
|
CitadelStationBot
|
342c7421cd
|
Automatic changelog generation for PR #13205 [ci skip]
|
2020-08-22 17:20:53 -05:00 |
|
|
silicons
|
4a52580c89
|
Merge pull request #13205 from EmeraldSundisk/cogfeex
Small fixes for CogStation.
|
2020-08-22 15:20:50 -07:00 |
|
|
CitadelStationBot
|
49a77c2cff
|
Automatic changelog generation for PR #13236 [ci skip]
|
2020-08-22 17:19:51 -05:00 |
|
|
silicons
|
68ee7b12bf
|
Merge pull request #13236 from timothyteakettle/lizard-fixes
lizards are shitcode
|
2020-08-22 15:19:48 -07:00 |
|
|
CitadelStationBot
|
977499b5cd
|
Automatic changelog generation for PR #13220 [ci skip]
|
2020-08-22 17:19:39 -05:00 |
|
|
silicons
|
4b24fb742a
|
Merge pull request #13220 from MrJWhit/expanding-airlocks
Expanding airlocks for the majority of stations
|
2020-08-22 15:19:35 -07:00 |
|
|
CitadelStationBot
|
8c7dc9b787
|
Automatic changelog generation for PR #13221 [ci skip]
|
2020-08-22 17:19:24 -05: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 |
|
|
CitadelStationBot
|
a4bd415af6
|
Automatic changelog generation for PR #13224 [ci skip]
|
2020-08-22 17:19:10 -05: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 |
|
|
CitadelStationBot
|
1a4339065b
|
Automatic changelog generation for PR #13228 [ci skip]
|
2020-08-22 17:19:03 -05: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 |
|
|
CitadelStationBot
|
9f0d42cd32
|
Automatic changelog generation for PR #13226 [ci skip]
|
2020-08-22 17:18:46 -05:00 |
|
|
silicons
|
6537197402
|
Merge pull request #13226 from zeroisthebiggay/thefunnytemporalkatanas
temporal katanas get a unique sprite and also a really memey suicide plus makes a song less earrape
|
2020-08-22 15:18:43 -07:00 |
|
|
Timothy Teakettle
|
60c8dd283e
|
shitcode begone
|
2020-08-22 20:02:36 +01:00 |
|
|
Changelogs
|
559c0d7024
|
Automatic changelog compile [ci skip]
|
2020-08-22 00:12:22 +00: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
|
5df58b3ca6
|
a
|
2020-08-21 02:24:43 -04: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
|
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 |
|