Commit Graph

30994 Commits

Author SHA1 Message Date
Ghom 609dc0e792 Merge pull request #11242 from Kraseo/green-thumb
Adds reagent traits to Lavaland flora + a botany QOL change
2020-02-29 23:03:53 +01:00
Ghom eeb8ec0b90 Merge pull request #11276 from kevinz000/gc_debug
adds and improves some gc debugging stuff
2020-02-29 22:53:58 +01:00
CitadelStationBot 41d36691bf Automatic changelog generation for PR #11227 [ci skip] 2020-02-29 13:42:05 -06:00
Ghom 295cd2991d Merge pull request #11227 from Putnam3145/salbut-jitter
Gave jittering to salbutamol
2020-02-29 20:42:03 +01:00
Lin d32cc370ad Merge pull request #11177 from Citadel-Station-13/Ghommie-patch-1
Broom shenanigeans.
2020-02-29 00:22:24 -06:00
Lin 5ee4a355c1 Merge pull request #11178 from Citadel-Station-13/Ghommie-patch-2
Fixing refrigerators locking when closed
2020-02-29 00:21:43 -06:00
CitadelStationBot ee7d443aa6 Automatic changelog generation for PR #11200 [ci skip] 2020-02-29 00:15:48 -06:00
Lin 252c64f23b Merge pull request #11200 from Hatterhat/boxes
blue boxes are now actually blue, and red boxes are actually red
2020-02-29 00:15:45 -06:00
Lin 70e2563579 Merge pull request #11266 from Ghommie/Ghommie-cit593
Fixing another couple mob holder oversights.
2020-02-29 00:13:58 -06:00
Lin 5ba6320f5e Merge pull request #11261 from Ghommie/Ghommie-cit591
Fixing escaped characters in flavor texts.
2020-02-29 00:12:35 -06:00
Lin a3eef43445 Merge pull request #11263 from Citadel-Station-13/Ghommie-patch-3
Removes extra unwarranted paramedic access.
2020-02-29 00:11:16 -06:00
kevinz000 4b9dfdf476 types 2020-02-28 13:24:39 -07:00
CitadelStationBot 8414f58b89 Automatic changelog generation for PR #11265 [ci skip] 2020-02-28 13:41:08 -06:00
kevinz000 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
Ghom c1907bda37 Merge pull request #11251 from Trilbyspaceclone/changlog_messing4
Changlog updating #5
2020-02-28 18:00:19 +01:00
kevinz000 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
kevinz000 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
kevinz000 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
Ghom 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
Ghommie 11f767d412 A couple mob holder oversights. Again? 2020-02-27 16:16:21 +01:00
Ghom 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
Ghom ebe16768d4 Merge pull request #11249 from Trilbyspaceclone/patch-298
Corrects bar stool name
2020-02-27 12:40:41 +01:00
Ghom d85563367e Whoopsie 2020-02-27 12:39:01 +01:00
Ghom bfe3bbb6d5 Update paramedic.dm 2020-02-27 12:34:13 +01:00
kevinz000 b854cb5980 Merge pull request #11262 from YakumoChen/LMAO-2CAT!!1
Adds 2cat, again
2020-02-27 01:22:25 -07:00
YakumoChen f6c170d31b Update tails.dm 2020-02-27 08:15:27 +00:00
YakumoChen 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
kevinz000 b0018a246c Merge pull request #11248 from Putnam3145/lick-pref
Made lick prefs actually save
2020-02-27 01:05:56 -07:00
YakumoChen 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
kevinz000 19962493a9 Merge pull request #11241 from Arturlang/Solar_updates
Ports TGs Solar updates.
2020-02-27 01:03:52 -07:00
YakumoChen 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
kevinz000 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
kevinz000 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
kevinz000 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
kevinz000 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
kevinz000 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
kevinz000 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