keronshb
|
3905e3e219
|
Hopefully fixes the mask, please im begging you
|
2021-10-15 19:29:45 -04:00 |
|
keronshb
|
dba9ea6351
|
Merge branch 'master' into familyport
|
2021-10-15 19:26:17 -04:00 |
|
keronshb
|
a507e2c3d3
|
Merge remote-tracking branch 'origin/familyport' into familyport
|
2021-10-15 19:26:06 -04:00 |
|
keronshb
|
6b23d177c8
|
Merge remote-tracking branch 'upstream/master'
|
2021-10-15 19:25:41 -04:00 |
|
keronshb
|
bd529dbe8d
|
FUCK
|
2021-10-15 19:25:08 -04:00 |
|
keronshb
|
c9a8bd0e45
|
Merge branch 'familyport'
|
2021-10-15 19:24:49 -04:00 |
|
keronshb
|
672765cb30
|
Removes all mask changes
|
2021-10-15 19:24:27 -04:00 |
|
keronshb
|
b278a0da26
|
Now adds the new mask sprite
|
2021-10-15 19:16:02 -04:00 |
|
keronshb
|
55f4c49e9b
|
Download from cit main directly
|
2021-10-15 19:09:41 -04:00 |
|
keronshb
|
779cebadb1
|
Merge branch 'master' into familyport
|
2021-10-15 19:01:38 -04:00 |
|
keronshb
|
3ffce42f59
|
Merge branch 'familyport'
|
2021-10-15 19:00:24 -04:00 |
|
keronshb
|
95bb14bb67
|
Adds the missing hats, missing wings, and clothes to vendor.
|
2021-10-15 16:59:16 -04:00 |
|
keronshb
|
1cd2c59776
|
Merge branch 'master' into familyport
|
2021-10-15 14:43:53 -04:00 |
|
keronshb
|
532fffa7e2
|
Please fix this
|
2021-10-15 14:41:35 -04:00 |
|
keronshb
|
a2602a092c
|
Correct fix?
|
2021-10-15 14:38:04 -04:00 |
|
keronshb
|
7a13354e9b
|
Another linter fix
|
2021-10-15 14:30:23 -04:00 |
|
keronshb
|
d59990f07f
|
Merge remote-tracking branch 'upstream/master'
|
2021-10-15 14:27:30 -04:00 |
|
keronshb
|
3edec0bade
|
Removes the extra icons folder
|
2021-10-15 14:27:08 -04:00 |
|
keronshb
|
b9923de4e4
|
Disables the Antag UI panel for non families
|
2021-10-15 14:24:00 -04:00 |
|
CitadelStationBot
|
bac8031057
|
Automatic changelog generation for PR #15268 [ci skip]
|
2021-10-15 02:19:29 -05:00 |
|
silicons
|
e6e0341cd8
|
Merge pull request #15268 from WanderingFox95/WanderingFox95-BDMFix
Removes the proc loop from the BDM's AI.
|
2021-10-15 00:19:26 -07:00 |
|
CitadelStationBot
|
1adfab6ec5
|
Automatic changelog generation for PR #15267 [ci skip]
|
2021-10-15 02:19:09 -05:00 |
|
silicons
|
c93fd1b486
|
Merge pull request #15267 from SandPoot/okay-cool-dynamic,-please-do-not-shove-it-down-my-throat
Removes hardcoded dynamic
|
2021-10-15 00:19:06 -07:00 |
|
CitadelStationBot
|
10b069ad67
|
Automatic changelog generation for PR #15266 [ci skip]
|
2021-10-15 02:18:52 -05:00 |
|
silicons
|
e99688242f
|
Merge pull request #15266 from SandPoot/tiny-sized-fixes
Tiny sized fixes
|
2021-10-15 00:18:48 -07:00 |
|
CitadelStationBot
|
8fb4509fbc
|
Automatic changelog generation for PR #15256 [ci skip]
|
2021-10-15 02:18:42 -05:00 |
|
silicons
|
d17419ed54
|
Merge pull request #15256 from keronshb/fatdart
no idea what this thing even is but he's chuffin back a fat dart and that's all that matters
|
2021-10-15 00:18:39 -07:00 |
|
CitadelStationBot
|
52dc17e2fd
|
Automatic changelog generation for PR #15262 [ci skip]
|
2021-10-15 02:18:23 -05:00 |
|
silicons
|
c449bfcdf6
|
Merge pull request #15262 from dapnee/pubbyonceagain
Moves Pubby Court and Adds the BEPIS to Science
|
2021-10-15 00:18:19 -07:00 |
|
CitadelStationBot
|
6f08bc98b8
|
Automatic changelog generation for PR #15263 [ci skip]
|
2021-10-15 02:18:05 -05:00 |
|
silicons
|
a8c5df2b4b
|
Merge pull request #15263 from DeltaFire15/ping-time
Adds pinging to asay
|
2021-10-15 00:18:02 -07:00 |
|
CitadelStationBot
|
97094619a0
|
Automatic changelog generation for PR #15253 [ci skip]
|
2021-10-15 02:17:53 -05:00 |
|
silicons
|
cca9efebd4
|
Merge pull request #15253 from SandPoot/tackler-gloves-no-spam-and-only-worn
Tackler gloves only work being worn
|
2021-10-15 00:17:49 -07:00 |
|
keronshb
|
1427157df3
|
Fixes space cops and adds config for dynamic
|
2021-10-15 00:12:46 -04:00 |
|
keronshb
|
aaa3fa277e
|
Adds hear_1, cells work.
|
2021-10-14 23:46:43 -04:00 |
|
keronshb
|
1971e65be3
|
Fixes the linter
|
2021-10-14 20:55:58 -04:00 |
|
keronshb
|
29a01f2d05
|
Antag Info and fixing the handshake finally
|
2021-10-14 20:43:41 -04:00 |
|
Changelogs
|
89fa46c116
|
Automatic changelog compile [ci skip]
|
2021-10-15 00:27:22 +00:00 |
|
keronshb
|
8cb16aa0f3
|
Fixes item transfers
|
2021-10-14 17:26:17 -04:00 |
|
keronshb
|
13140f9bb9
|
Somewhat fixed huds and stuff, not 100%
|
2021-10-14 16:36:18 -04:00 |
|
keronshb
|
bf7cd77096
|
Fixes a few things
|
2021-10-13 23:25:01 -04:00 |
|
keronshb
|
6331ced3e5
|
The rest of the offering stuff
|
2021-10-13 22:13:33 -04:00 |
|
Changelogs
|
b5e20ad231
|
Automatic changelog compile [ci skip]
|
2021-10-14 00:25:35 +00:00 |
|
SandPoot
|
bdd0cee2eb
|
Update ticker.dm
shhhh
|
2021-10-13 19:12:23 -03:00 |
|
WanderingFox95
|
75fee6ec25
|
applies requested changes
|
2021-10-13 22:25:15 +02:00 |
|
WanderingFox95
|
afbc34eea2
|
Hmm
|
2021-10-13 22:18:07 +02:00 |
|
SandPoot
|
39a7449625
|
Update ticker.dm
|
2021-10-13 16:57:00 -03:00 |
|
SandPoot
|
4d7e1b32db
|
Update ticker.dm
|
2021-10-13 16:49:44 -03:00 |
|
WanderingFox95
|
6763324506
|
Fixes the BDM's proc loop (Ported from TG)
|
2021-10-13 21:47:24 +02:00 |
|
WanderingFox95
|
a2b42d1b69
|
Merge branch 'Citadel-Station-13:master' into master
|
2021-10-13 21:37:14 +02:00 |
|