Commit Graph

33026 Commits

Author SHA1 Message Date
Ghommie
811f65e48b Removing troublesome and filler uplink items. 2020-04-18 19:51:09 +02:00
CitadelStationBot
19328b8710 Automatic changelog generation for PR #11844 [ci skip] 2020-04-16 12:08:13 -05:00
Ghom
e511deabcf Merge pull request #11844 from Arturlang/crafting_fixes
Its no longer possible to craft multiple things at a time
2020-04-16 19:08:09 +02:00
CitadelStationBot
6c55480787 Automatic changelog generation for PR #11734 [ci skip] 2020-04-16 12:06:52 -05:00
Ghom
10bc1229f9 Merge pull request #11734 from Trilbyspaceclone/patch-329
Six new Sci based bounties!
2020-04-16 19:06:48 +02:00
Ghom
19f79f8843 Merge pull request #11611 from monster860/patch-2
Makes so turning in place updates riders when riding someone's back
2020-04-16 19:06:10 +02:00
Ghom
eb48e00bcb Merge pull request #11805 from kevinz000/damage_procs_lite
/carbon adjustStaminaLoss is now armor-piercing *as intended* before our modularized bandaid
2020-04-16 19:05:34 +02:00
CitadelStationBot
30617f62f1 Automatic changelog generation for PR #11839 [ci skip] 2020-04-16 12:04:19 -05:00
Ghom
bceca18626 Merge pull request #11839 from Citadel-Station-13/kevinz000-patch-1
you can no longer knock out xenomorphs by punching them in the face i guess
2020-04-16 19:04:16 +02:00
Putnam3145
d60174f585 Merge pull request #11881 from Ghommie/Ghommie-cit684
Removed that one ss13 slur the code.
2020-04-16 08:29:10 -07:00
Ghom
13def914b6 Update phobia.json 2020-04-16 17:18:11 +02:00
Ghom
894579b068 indention 2020-04-16 17:17:15 +02:00
Ghommie
109a69d301 Removed that one infamous ss13 slur the code. 2020-04-16 16:58:36 +02:00
CitadelStationBot
c7b4715cff Automatic changelog generation for PR #11851 [ci skip] 2020-04-16 07:46:23 -05:00
Ghom
ad6a2b4671 Merge pull request #11851 from Citadel-Station-13/kevinz000-patch-4
Contractor kits are now poplocked to 30.
2020-04-16 14:46:20 +02:00
CitadelStationBot
19108dc24c Automatic changelog generation for PR #11879 [ci skip] 2020-04-16 07:22:02 -05:00
Ghom
7cacdb9db7 Merge pull request #11879 from Seris02/magboooooooooooots
fixes magboots
2020-04-16 14:21:58 +02:00
Seris02
c0ff018bef fixes magboots 2020-04-16 16:23:55 +08:00
CitadelStationBot
ab9c04ceb9 Automatic changelog generation for PR #11853 [ci skip] 2020-04-16 03:14:03 -05:00
kevinz000
3dd395e95a Merge pull request #11853 from UristMcAstronaut/master
Revert "makes circuit theft admin only" #11838
2020-04-16 01:13:58 -07:00
Changelogs
fd4e895dd0 Automatic changelog compile [ci skip] 2020-04-16 00:11:17 +00:00
UristMcAstronaut
ec452de0b2 Merge remote-tracking branch 'upstream/master' 2020-04-15 08:41:17 +00:00
Changelogs
988cec57b1 Automatic changelog compile [ci skip] 2020-04-15 00:12:14 +00:00
Ghom
db1ecff52f Merge pull request #11858 from Linzolle/tos-compliance
ok for REAL
2020-04-15 02:10:59 +02:00
Linzolle
2cbd6d20ea come on 2020-04-14 18:28:11 -05:00
Putnam3145
a9db63ded7 Merge pull request #11856 from Linzolle/tos-compliance
wait I missed one
2020-04-14 16:07:08 -07:00
Linzolle
d43cb78b8b one more 2020-04-14 18:02:51 -05:00
CitadelStationBot
de476249c7 Automatic changelog generation for PR #11799 [ci skip] 2020-04-14 18:02:45 -05:00
CitadelStationBot
7ddd44da22 Automatic changelog generation for PR #11855 [ci skip] 2020-04-14 18:02:39 -05:00
Ghom
da54b844d0 Merge pull request #11855 from Linzolle/tos-compliance
ToS compliance
2020-04-15 01:02:36 +02:00
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
UristMcAstronaut
b6bbe1738e Add files via upload 2020-04-14 16:57:34 +00:00
UristMcAstronaut
1eafcbeb1e Add files via upload 2020-04-14 16:22:16 +00:00
UristMcAstronaut
ec734475cc Add files via upload 2020-04-14 16:21:30 +00:00
UristMcAstronaut
c7b174676b Add files via upload 2020-04-14 16:15:31 +00:00
UristMcAstronaut
54ac62bf46 Merge pull request #5 from Citadel-Station-13/master
update
2020-04-14 15:48:29 +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
kevinz000
3ec71612e7 Update uplink_bundles.dm 2020-04-14 01:49:14 -07: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