Linzolle
|
166370fb6c
|
missed one
|
2020-04-14 17:55:22 -05:00 |
|
Linzolle
|
39e6541ccd
|
remove bad words
|
2020-04-14 17:54:07 -05:00 |
|
Linzolle
|
f828f4c4b7
|
Merge remote-tracking branch 'forrest/wewlad' into tos-compliance
|
2020-04-14 17:33:47 -05:00 |
|
Lin
|
79f41bc654
|
Merge pull request #11841 from Citadel-Station-13/Ghommie-patch-4
Hardsuit helmet peeve.
|
2020-04-14 18:37:31 +00:00 |
|
CitadelStationBot
|
8f71aafde5
|
Automatic changelog generation for PR #11809 [ci skip]
|
2020-04-14 06:17:15 -05:00 |
|
Ghom
|
49e36e47ff
|
Merge pull request #11809 from kevinz000/storage_rework
Adds baystation-style volumetric space storage support
|
2020-04-14 13:17:11 +02:00 |
|
CitadelStationBot
|
6a4a937da5
|
Automatic changelog generation for PR #11618 [ci skip]
|
2020-04-14 05:38:37 -05:00 |
|
Ghom
|
5d01e05991
|
Merge pull request #11618 from Arturlang/Garlic
Adds garlic, and tweaks bloodsuckers a bunch.
|
2020-04-14 12:38:34 +02:00 |
|
CitadelStationBot
|
d0b1a770be
|
Automatic changelog generation for PR #11655 [ci skip]
|
2020-04-14 03:37:39 -05:00 |
|
kevinz000
|
b10c479d16
|
Merge pull request #11655 from Citadel-Station-13/Ghommie-patch-3
Gives a cooldown to the crusher's vortex talisman trophy.
|
2020-04-14 01:37:36 -07:00 |
|
CitadelStationBot
|
3259d13925
|
Automatic changelog generation for PR #11826 [ci skip]
|
2020-04-14 03:35:49 -05:00 |
|
kevinz000
|
7861b044ea
|
Merge pull request #11826 from Ghommie/Ghommie-cit675
Body size preferences! Oh no!
|
2020-04-14 01:35:46 -07:00 |
|
CitadelStationBot
|
4cd8f1b934
|
Automatic changelog generation for PR #11828 [ci skip]
|
2020-04-14 03:35:07 -05:00 |
|
kevinz000
|
5baa5ebf55
|
Merge pull request #11828 from Citadel-Station-13/Ghommie-patch-2
Fixes toilet cistern loot spawning on the floor.
|
2020-04-14 01:35:04 -07:00 |
|
CitadelStationBot
|
fb82619bd3
|
Automatic changelog generation for PR #11829 [ci skip]
|
2020-04-14 03:34:48 -05:00 |
|
kevinz000
|
1f900f0e9d
|
Merge pull request #11829 from Citadel-Station-13/Ghommie-patch-5
Fixing a whacky miniature cell duping issue.
|
2020-04-14 01:34:45 -07:00 |
|
CitadelStationBot
|
ef2bfd74c2
|
Automatic changelog generation for PR #11830 [ci skip]
|
2020-04-14 03:34:22 -05:00 |
|
kevinz000
|
e271376c4e
|
Merge pull request #11830 from Ghommie/Ghommie-cit676
Fixes the phantom thief component, again
|
2020-04-14 01:34:18 -07:00 |
|
CitadelStationBot
|
ee3bd67756
|
Automatic changelog generation for PR #11831 [ci skip]
|
2020-04-14 03:34:01 -05:00 |
|
kevinz000
|
f460d0dab0
|
Merge pull request #11831 from Ghommie/Ghommie-cit677
Fixing some sprite accessories offsets, shifted the icon states 2 px down.
|
2020-04-14 01:33:57 -07:00 |
|
CitadelStationBot
|
9c2a3fb4cc
|
Automatic changelog generation for PR #11838 [ci skip]
|
2020-04-14 03:33:10 -05:00 |
|
kevinz000
|
2961bf8698
|
Merge pull request #11838 from kappa-sama/gamingtime
makes circuit theft admin only
|
2020-04-14 01:33:06 -07:00 |
|
Artur
|
fb7dc7a54c
|
Fucking icons
|
2020-04-14 09:42:11 +03:00 |
|
Artur
|
356f2913d7
|
Ghommies suggestions and renames a proc
|
2020-04-14 09:30:14 +03:00 |
|
Artur
|
2e2fc45632
|
Conflicting icon fix
|
2020-04-14 09:28:43 +03:00 |
|
Artur
|
f910a0fd32
|
Conflict fixes
|
2020-04-14 09:27:54 +03:00 |
|
Putnam3145
|
d1bdcd3401
|
Merge pull request #11840 from Citadel-Station-13/Ghommie-patch-1
Actually fixed wizard garbs.
|
2020-04-13 17:26:55 -07:00 |
|
CitadelStationBot
|
ac36cd49a5
|
Automatic changelog generation for PR #11379 [ci skip]
|
2020-04-13 19:10:49 -05:00 |
|
kevinz000
|
6d7cc834f6
|
Merge pull request #11379 from Ghommie/Ghommie-cit611
Polychromic element.
|
2020-04-13 17:10:45 -07:00 |
|
Ghommie
|
39e645b018
|
I knew using lazy helpers wouldn't have helped much.
|
2020-04-14 01:55:01 +02:00 |
|
Ghommie
|
42ff9b1d35
|
Final test, fixes and parent calls.
|
2020-04-14 01:23:26 +02:00 |
|
Ghommie
|
616d482cf6
|
Deleting poly clothes copypasta.
|
2020-04-13 22:51:46 +02:00 |
|
kappa-sama
|
94bcc6a64b
|
removes these
|
2020-04-13 14:38:30 -04:00 |
|
Ghommie
|
8c995dbad9
|
Making things work.
|
2020-04-13 19:16:55 +02:00 |
|
Ghommie
|
bfa006fac1
|
Fixing runtime errors.
|
2020-04-13 17:25:13 +02:00 |
|
CitadelStationBot
|
1cd57c265b
|
Automatic changelog generation for PR #11834 [ci skip]
|
2020-04-13 09:44:18 -05:00 |
|
Ghom
|
25f1a83473
|
Merge pull request #11834 from deathride58/linuxfail2topic
adds rudimentary linux iptables support for fail2topic (and makes fail2topic disabled by default while i'm at it)
|
2020-04-13 16:44:15 +02:00 |
|
Ghommie
|
db43f53ac4
|
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into Ghommie-cit611
|
2020-04-13 16:15:40 +02:00 |
|
Ghommie
|
0816512150
|
more work.
|
2020-04-13 16:09:52 +02:00 |
|
Ghom
|
5765ceb316
|
Update hardsuit.dm
|
2020-04-13 15:02:01 +02:00 |
|
Ghom
|
873e67f79c
|
Update hardsuit.dm
|
2020-04-13 14:57:47 +02:00 |
|
CitadelStationBot
|
affac4d907
|
Automatic changelog generation for PR #11275 [ci skip]
|
2020-04-13 07:50:27 -05:00 |
|
kevinz000
|
9f2ed092c5
|
Merge pull request #11275 from Citadel-Station-13/Ghommie-patch-6
Reenables the swarmers event.
|
2020-04-13 05:50:24 -07:00 |
|
CitadelStationBot
|
a1ade99b98
|
Automatic changelog generation for PR #10986 [ci skip]
|
2020-04-13 07:25:46 -05:00 |
|
Ghom
|
dfa58cb517
|
Merge pull request #10986 from Seris02/atomwalkers
wall walking boots for traitors
|
2020-04-13 14:25:43 +02:00 |
|
Ghom
|
8145513ba7
|
Actually fixed wizard garbs.
|
2020-04-13 14:19:13 +02:00 |
|
Ghom
|
6157500f25
|
FYI, Dropped() already handles it.
|
2020-04-13 14:16:48 +02:00 |
|
Seris02
|
468c59bf49
|
oops
|
2020-04-13 20:12:20 +08:00 |
|
kevinz000
|
768909020e
|
Merge pull request #11827 from kiwedespars/nerf
nerfs immortal haste cd
|
2020-04-12 22:35:10 -07:00 |
|
kevinz000
|
105d405d2d
|
Merge pull request #11837 from Ghommie/Ghommie-cit678
Item color removal port fixes.
|
2020-04-12 22:34:45 -07:00 |
|