Commit Graph
30979 Commits
Author SHA1 Message Date
kevinz000andGitHub 18bdb753d3 bet 2020-03-03 21:13:59 -07:00
kevinz000andGitHub 0cf7f2e882 Update energy.dm 2020-03-03 21:07:24 -07:00
cbf2355f19 Update code/datums/elements/sword_point.dm
Co-Authored-By: Ghom <42542238+Ghommie@users.noreply.github.com>
2020-03-03 21:06:05 -07:00
kevinz000andGitHub ba55351e4a Update twohanded.dm 2020-02-28 13:43:11 -07:00
kevinz000 93d91b1808 Merge remote-tracking branch 'citadel/master' into sword_point 2020-02-28 13:39:56 -07:00
kevinz000 8ef68fa36b En garde! 2020-02-28 13:35:41 -07:00
CitadelStationBot 8414f58b89 Automatic changelog generation for PR #11265 [ci skip] 2020-02-28 13:41:08 -06:00
kevinz000andGitHub c5edeb9913 Merge pull request #11265 from Citadel-Station-13/Ghommie-patch-4
Cogchamp mixing sound made less annoyingly long.
2020-02-28 12:41:05 -07:00
CitadelStationBot ea612b13cf Automatic changelog generation for PR #11251 [ci skip] 2020-02-28 11:00:22 -06:00
GhomandGitHub c1907bda37 Merge pull request #11251 from Trilbyspaceclone/changlog_messing4
Changlog updating #5
2020-02-28 18:00:19 +01:00
kevinz000andGitHub e39d7fa49d Merge pull request #11259 from Ghommie/Ghommie-cit590
Porting update_icon improvements.
2020-02-28 04:30:12 -07:00
CitadelStationBot 70bf885968 Automatic changelog generation for PR #11260 [ci skip] 2020-02-28 05:29:24 -06:00
kevinz000andGitHub 25f86c18d1 Merge pull request #11260 from Kraseo/i-hate-gangs
Removes soporific sniper rifle rounds from gang uplinks
2020-02-28 04:29:22 -07:00
kevinz000andGitHub d0eebdbb02 Merge pull request #11273 from Arturlang/blob_broacast_exploit
[s] Fixes blob broadcast HTML Injection.
2020-02-28 04:28:41 -07:00
Artur c6fcffe949 Made the same mistake... 2020-02-28 13:19:27 +02:00
Artur d6e402aa5d Damned 2020-02-28 13:06:28 +02:00
GhomandGitHub 879032c52f Merge pull request #11255 from deathride58/sprintconfigdefaults
Makes the default sprint config options match live's actual config
2020-02-27 16:23:27 +01:00
GhomandGitHub eb3f985434 Update drinks_recipes.dm 2020-02-27 14:16:39 +01:00
CitadelStationBot 721f4f6bff Automatic changelog generation for PR #11249 [ci skip] 2020-02-27 05:40:43 -06:00
GhomandGitHub ebe16768d4 Merge pull request #11249 from Trilbyspaceclone/patch-298
Corrects bar stool name
2020-02-27 12:40:41 +01:00
kevinz000andGitHub b854cb5980 Merge pull request #11262 from YakumoChen/LMAO-2CAT!!1
Adds 2cat, again
2020-02-27 01:22:25 -07:00
YakumoChenandGitHub f6c170d31b Update tails.dm 2020-02-27 08:15:27 +00:00
YakumoChenandGitHub e682845ebf Update tails.dm 2020-02-27 08:09:34 +00:00
CitadelStationBot 2008c2f78f Automatic changelog generation for PR #11248 [ci skip] 2020-02-27 02:05:59 -06:00
kevinz000andGitHub b0018a246c Merge pull request #11248 from Putnam3145/lick-pref
Made lick prefs actually save
2020-02-27 01:05:56 -07:00
YakumoChenandGitHub 2cb95e200a Update tails.dm 2020-02-27 08:04:32 +00:00
CitadelStationBot 5f7097aa43 Automatic changelog generation for PR #11241 [ci skip] 2020-02-27 02:03:54 -06:00
kevinz000andGitHub 19962493a9 Merge pull request #11241 from Arturlang/Solar_updates
Ports TGs Solar updates.
2020-02-27 01:03:52 -07:00
YakumoChenandGitHub e0c7c98253 Update tails.dm 2020-02-27 08:01:13 +00:00
CitadelStationBot 8eaad92404 Automatic changelog generation for PR #11235 [ci skip] 2020-02-27 02:00:48 -06:00
kevinz000andGitHub 924c7e0d05 Merge pull request #11235 from Detective-Google/if-it-compiles-it-works
unfucks paramedics access + PDA
2020-02-27 01:00:45 -07:00
CitadelStationBot 62f823f9bb Automatic changelog generation for PR #11202 [ci skip] 2020-02-27 01:59:59 -06:00
kevinz000andGitHub f00a2c1cd3 Merge pull request #11202 from Hatterhat/beegions-but-actual-bees
Beegions, But With Actual Bees
2020-02-27 00:59:57 -07:00
CitadelStationBot d97d806ff4 Automatic changelog generation for PR #11220 [ci skip] 2020-02-27 01:59:22 -06:00
kevinz000andGitHub a92baba125 Merge pull request #11220 from Kraseo/powersink-of-tc
Gives traitors with power-draining sabotage objective a free powersink
2020-02-27 00:59:20 -07:00
CitadelStationBot d606d8670c Automatic changelog generation for PR #11244 [ci skip] 2020-02-27 01:57:56 -06:00
kevinz000andGitHub 40c36213df Merge pull request #11244 from Ghommie/Ghommie-cit589
Fixing virology cause someone didn't covert ALL mob/species biotypes to flags.
2020-02-27 00:57:54 -07:00
CitadelStationBot 420856b385 Automatic changelog generation for PR #11219 [ci skip] 2020-02-27 01:54:50 -06:00
kevinz000andGitHub a8a8e242d8 Merge pull request #11219 from YakumoChen/LMAO-2CAT!!1
Adds 2cat (tail)
2020-02-27 00:54:47 -07:00
CitadelStationBot 3049ab3e51 Automatic changelog generation for PR #11240 [ci skip] 2020-02-27 01:53:13 -06:00
kevinz000andGitHub 648e304ef8 Merge pull request #11240 from Trilbyspaceclone/patch-297
Raises blob point cap by 150 (aka they can store 250 now)
2020-02-27 00:53:10 -07:00
Kraseo 9da493b483 i genuinely do not like anything robustin has ever touched in his lifetime 2020-02-27 02:28:13 +01:00
GhomandGitHub a99e9ec2ff Ok 2020-02-27 02:15:03 +01:00
Ghommie b5f472c6dd thank you dreamchecker 2020-02-27 01:47:18 +01:00
Ghommie fc76cd9a9b Porting update_icon improvements. Part 1. 2020-02-27 01:21:03 +01:00
CitadelStationBot 46c76d9848 Automatic changelog generation for PR #11257 [ci skip] 2020-02-26 18:19:00 -06:00
GhomandGitHub 6e25a34aaa Merge pull request #11257 from Linzolle/pacifist-spike
pacifists can no longer meatspike
2020-02-27 01:18:57 +01:00
CitadelStationBot 176d263d3a Automatic changelog generation for PR #11254 [ci skip] 2020-02-26 18:11:26 -06:00
GhomandGitHub 803ac258f8 Merge pull request #11254 from deathride58/fuckclosets
Makes harm intent clicking closets attack them rather than place an item inside
2020-02-27 01:11:23 +01:00
GhomandGitHub 2c642d5507 Update kitchen_spike.dm 2020-02-27 01:10:38 +01:00