Commit Graph

37341 Commits

Author SHA1 Message Date
silicons
1abe2458ee Update taeclowndo.dm (#13227) 2020-08-23 20:58:34 +02:00
CitadelStationBot
0f9c34415b Automatic changelog generation for PR #13204 [ci skip] 2020-08-23 07:08:53 -05:00
silicons
2fa023346a Merge pull request #13204 from timothyteakettle/donator-items
adds three t1 donator items
2020-08-23 05:08:50 -07:00
CitadelStationBot
86862d5eb3 Automatic changelog generation for PR #13239 [ci skip] 2020-08-23 07:08:18 -05:00
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
CitadelStationBot
d1e2574fbc Automatic changelog generation for PR #13243 [ci skip] 2020-08-23 07:07:15 -05:00
silicons
83800f70dc Merge pull request #13243 from MrJWhit/fuck-didn't-get-all-areas
Fuck I didn't get all the areas
2020-08-23 05:07:12 -07:00
Putnam3145
ecbf8a5dc2 Merge pull request #13245 from Arturlang/fortitude_norun
Fortitude walking fix
2020-08-23 04:33:51 -07:00
Artur
b47b14cdaa Shoot me please 2020-08-23 14:26:07 +03:00
MrJWhit
9db6941dad Fuck 2020-08-23 00:48:58 -04:00
Changelogs
45d3157983 Automatic changelog compile [ci skip] 2020-08-23 00:15:13 +00:00
zeroisthebiggay
8873b6b48f pathé
pathé
2020-08-22 18:29:33 -04:00
zeroisthebiggay
66e81c75f8 i have been convinced
: )
2020-08-22 18:22:43 -04: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
zerothebigboy
21836b4ec8 : ) 2020-08-22 18:11:03 -04: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
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