Commit Graph

27134 Commits

Author SHA1 Message Date
Ghom 19fc981cc1 Merge pull request #9596 from Linzolle/abductor-update
Bring abductors up-to-date with /tg/.
2019-12-21 11:15:29 +01:00
CitadelStationBot 85fca5c560 Automatic changelog generation for PR #10059 [ci skip] 2019-12-21 04:05:39 -06:00
Ghom a7cda1aea0 Merge pull request #10059 from lolman360/HeadCorgi
you can pick up corgis now
2019-12-21 11:05:36 +01:00
CitadelStationBot 01def96b3d Automatic changelog generation for PR #10058 [ci skip] 2019-12-21 00:20:52 -06:00
kevinz000 97f678b542 Merge pull request #10058 from Ghommie/Ghommie-cit432
Spinfusor nerf, cause a 7k cost supply pack containing 32 explosive munitions that work just fine without the gun is just pure balance.
2019-12-20 23:20:49 -07:00
lolman360 b490873f2a ff 2019-12-21 13:13:37 +11:00
lolman360 4c7cc3615e ff 2019-12-21 12:48:09 +11:00
lolman360 3043a4f8c9 ghom help 2019-12-21 12:47:36 +11:00
lolman360 7048e4e5ab hhh 2019-12-21 12:43:48 +11:00
lolman360 b02ffa2e2d Update inhand_holder.dm 2019-12-21 12:40:41 +11:00
CitadelStationBot 353564811c Automatic changelog generation for PR #10200 [ci skip] 2019-12-20 15:55:25 -06:00
Ghom a398b7c413 Merge pull request #10200 from Citadel-Station-13/kevinz000-patch-125
Adds 8 character save slots
2019-12-20 22:55:22 +01:00
CitadelStationBot ce0e1734fc Automatic changelog generation for PR #10235 [ci skip] 2019-12-20 09:27:49 -06:00
Ghom 9a38612ec4 Merge pull request #10235 from Citadel-Station-13/kevinz000-patch-128
flashbangs process flash/bang separately based on blindness/hearing and uses viewers(), which means xray users suffer too if they see them go off
2019-12-20 16:27:47 +01:00
CitadelStationBot 7be6112411 Automatic changelog generation for PR #10231 [ci skip] 2019-12-20 09:18:09 -06:00
Ghom 6673646813 Merge pull request #10231 from Seris02/wintercoatcolors
fixes the sprites for some winter coats
2019-12-20 16:18:06 +01:00
Ghom 4016835b0a Merge pull request #9798 from Citadel-Station-13/kevinz000-patch-114
Radiation storms no longer do random mutations in of itself, but are far more lethal
2019-12-20 14:32:42 +01:00
CitadelStationBot a62610780e Automatic changelog generation for PR #9563 [ci skip] 2019-12-20 07:28:24 -06:00
Ghom b581f97fba Merge pull request #9563 from Thalpy/Superbases-goodbye
[TESTMERGE] Goodbye, superpH, you were too wild for our world.
2019-12-20 14:28:21 +01:00
Ghom d33feb6c35 Merge pull request #9888 from Citadel-Station-13/kevinz000-patch-116
The high voltage from tasers can now set people with fire stacks (so things like dousing in fuel) on fire
2019-12-20 14:26:50 +01:00
CitadelStationBot fd9c836509 Automatic changelog generation for PR #9925 [ci skip] 2019-12-20 07:26:27 -06:00
Ghom f56684a473 Merge pull request #9925 from Linzolle/cosmic-brain
change cosmic coat crafting recipe
2019-12-20 14:26:24 +01:00
CitadelStationBot 152f95bbdf Automatic changelog generation for PR #10051 [ci skip] 2019-12-20 07:25:13 -06:00
Ghom 6d824c99cf Merge pull request #10051 from kappa-sama/patch-9
puts our legion more up to date with tg's
2019-12-20 14:25:09 +01:00
CitadelStationBot 5cb9dd71ad Automatic changelog generation for PR #10142 [ci skip] 2019-12-20 06:36:06 -06:00
Ghom d52a469933 Merge pull request #10142 from Trilbyspaceclone/patch-244
Feast or Famine is shit. Makes CE hardsuit raditation proof hat wise, buffes its rest of body by 5
2019-12-20 13:36:02 +01:00
CitadelStationBot 906a59503f Automatic changelog generation for PR #10126 [ci skip] 2019-12-20 06:34:50 -06:00
Ghom e526f26f46 Merge pull request #10126 from Putnam3145/he-tweaks
Makes HE pipes realistically radiate away heat
2019-12-20 13:34:47 +01:00
CitadelStationBot d28811fe89 Automatic changelog generation for PR #10054 [ci skip] 2019-12-20 06:27:50 -06:00
Ghom 1748a5ee4b Merge pull request #10054 from kappa-sama/patch-10
autolathe .357 speedloaders->bullets, surplus rifle bullets in hacked lathe
2019-12-20 13:27:35 +01:00
Ghom 9567d53007 I'm a god. How can you defeat a god? What a grand and intoxicating innocence, how can you be so naive? 2019-12-20 13:24:48 +01:00
CitadelStationBot fa11979355 Automatic changelog generation for PR #10193 [ci skip] 2019-12-20 06:15:57 -06:00
Ghom 481371bca7 Merge pull request #10193 from Commandersand/yeet
gamer is now filtered for clowns
2019-12-20 13:15:54 +01:00
lolman360 6188ec034d h 2019-12-20 16:10:13 +11:00
Lin 4d466e17f3 Merge pull request #10173 from Ghommie/Ghommie-cit461
Fixing a boxstation pipenet mapping issue.
2019-12-19 23:43:16 +00:00
CitadelStationBot 702aff08c4 Automatic changelog generation for PR #10214 [ci skip] 2019-12-19 17:42:09 -06:00
Lin 8d54e8afcc Merge pull request #10214 from Ghommie/Ghommie-cit472
Brings carbon action intent hotkeys down to living.
2019-12-19 23:42:06 +00:00
CitadelStationBot 1e7e66b8c5 Automatic changelog generation for PR #10207 [ci skip] 2019-12-19 17:41:40 -06:00
Lin f38747ed70 Merge pull request #10207 from Ghommie/Ghommie-cit468
Fixes pubby wall meds being var-edited snowflakes.
2019-12-19 23:41:36 +00:00
Lin 8511c44f0f Merge pull request #10199 from Ghommie/Ghommie-cit467
Fixing and cleaning up the blood bank generator code.
2019-12-19 23:39:17 +00:00
CitadelStationBot d9002bbe8b Automatic changelog generation for PR #10079 [ci skip] 2019-12-19 17:26:56 -06:00
Lin 138b460af3 Merge pull request #10079 from Ghommie/Ghommie-cit438
Fixes reactive armor onmob overlays not updating when toggled and reactive teleport armor still using forceMove()
2019-12-19 23:26:53 +00:00
Lin 3dc00519fc Merge pull request #9910 from Ghommie/Ghommie-cit390
Unmodularize gamemodes folder.
2019-12-19 23:23:20 +00:00
Linzolle f3aa363a2e drop 2019-12-19 17:19:07 -06:00
Lin 42d8228c75 Merge pull request #9722 from Ghommie/Ghommie-cit320
Umodularize saycode and meat slabs.
2019-12-19 23:03:48 +00:00
CitadelStationBot 73a0976d4e Automatic changelog generation for PR #10160 [ci skip] 2019-12-19 17:00:55 -06:00
Lin 66c6659681 Merge pull request #10160 from Ghommie/Ghommie-cit453
Ports improved and simplier fire alarms.
2019-12-19 23:00:52 +00:00
CitadelStationBot 53abbbaf85 Automatic changelog generation for PR #10067 [ci skip] 2019-12-19 16:03:25 -06:00
nik707 c1be6ba222 Merge pull request #10067 from Sishen1542/botnayn
You can change a plant's name, description and its seed's description by using a pen on the seed
2019-12-19 16:03:22 -06:00
CitadelStationBot f4cbc986da Automatic changelog generation for PR #10090 [ci skip] 2019-12-19 14:11:30 -06:00