Commit Graph

29669 Commits

Author SHA1 Message Date
Ghommie a3e2ec372f Makes it compile also custom emote fix. 2020-02-06 01:40:14 +01:00
Ghommie 233ed5873f race conditions and turfs beings special. 2020-02-06 01:13:28 +01:00
Ghommie ab06c23a2b runtime is forever, errors are eternal. 2020-02-05 23:48:17 +01:00
CitadelStationBot af8d6c913d Automatic changelog generation for PR #10855 [ci skip] 2020-02-05 02:10:25 -06:00
kevinz000 f05d37b7fd Merge pull request #10855 from Trilbyspaceclone/patch-274
The Syndicats are run by aliens - Fixes Alien cargo crate to be  correction emag
2020-02-05 01:10:21 -07:00
CitadelStationBot 087ff0cab2 Automatic changelog generation for PR #10747 [ci skip] 2020-02-05 00:38:17 -06:00
Ghom 02d1761c0a Merge pull request #10747 from Citadel-Station-13/kevinz000-patch-11
shoving someone into a wall on the second shove now also disarms their weapon
2020-02-05 07:38:14 +01:00
CitadelStationBot f7d9c2c739 Automatic changelog generation for PR #10788 [ci skip] 2020-02-05 00:36:17 -06:00
Ghom 4cdade4b2d Merge pull request #10788 from Seris02/crushboots
crushing magboots for tators
2020-02-05 07:36:14 +01:00
CitadelStationBot 575f6e4ebc Automatic changelog generation for PR #10791 [ci skip] 2020-02-05 00:23:39 -06:00
Ghom 402283e86a Merge pull request #10791 from Arturlang/more_bloodsucker_tweaks
[READY] Further tweaks to bloodsuckers
2020-02-05 07:23:36 +01:00
Ghom 20a5f905bc Merge pull request #10832 from r4d6/shitters
Mining Update : Real update
2020-02-05 07:20:02 +01:00
CitadelStationBot 28749a5947 Automatic changelog generation for PR #10583 [ci skip] 2020-02-05 00:19:40 -06:00
Ghom 4b1e3d216f Merge pull request #10583 from Putnam3145/arousal-tweaks
Consent logging
2020-02-05 07:19:37 +01:00
Ghom 68cbc3487a Update species.dm 2020-02-05 07:09:55 +01:00
CitadelStationBot 09e9ca9633 Automatic changelog generation for PR #10812 [ci skip] 2020-02-05 00:02:14 -06:00
Ghom 77eb7b8a96 Merge pull request #10812 from Tupinambis/StunbatonFUNCTIONAL
Stunbaton Balance Adjustments 2.0 (Unfucked Edition)
2020-02-05 07:02:11 +01:00
CitadelStationBot 420a8a8643 Automatic changelog generation for PR #10869 [ci skip] 2020-02-04 23:52:23 -06:00
Ghom 472bddb5be Merge pull request #10869 from kevinz000/WHY
can we talk about how admin attack logs being viewable in game is not a good thing, alternatively "i want a word with whoever coded mech logging"
2020-02-05 06:52:20 +01:00
CitadelStationBot 6961e9cd2a Automatic changelog generation for PR #10875 [ci skip] 2020-02-04 23:50:13 -06:00
Ghom aaa45f102e Merge pull request #10875 from ancientpower/m-bunny-ears
Adds bunny ear style for humans and anthromorphs
2020-02-05 06:50:10 +01:00
CitadelStationBot e501271d87 Automatic changelog generation for PR #10739 [ci skip] 2020-02-04 19:03:45 -06:00
Ghom b4ba381b59 Merge pull request #10739 from r4d6/Dwarven_Language
Add a Dwarf Language
2020-02-05 02:03:42 +01:00
r4d6 f42ef66846 Move the lockers and the beacon 2020-02-04 19:25:10 -05:00
r4d6 60163330f7 closets 2020-02-04 19:07:01 -05:00
r4d6 32f3eec050 Real 2020-02-04 19:03:45 -05:00
CitadelStationBot 038f78bbcd Automatic changelog generation for PR #10893 [ci skip] 2020-02-04 17:04:24 -06:00
Ghom 642a8c4217 Merge pull request #10893 from Arturlang/TGUI_Next_Crafting
[READY]TGUI Next Crafting
2020-02-05 00:04:21 +01:00
Lin 66638a39b7 Merge pull request #10851 from Citadel-Station-13/Ghommie-patch-3
Fixing little blood bank gnerator examine runtime error.
2020-02-04 20:36:28 +00:00
CitadelStationBot dbe144f961 Automatic changelog generation for PR #10874 [ci skip] 2020-02-04 14:35:02 -06:00
Lin e8ea16c3f2 Merge pull request #10874 from Citadel-Station-13/Ghommie-patch-6
Fixes the petting element.
2020-02-04 20:34:59 +00:00
CitadelStationBot 5e1cbd7174 Automatic changelog generation for PR #10840 [ci skip] 2020-02-04 14:15:40 -06:00
Ghom c24ffa8f1c Merge pull request #10840 from Putnam3145/easier_bunker
Save panic bunker between rounds
2020-02-04 21:15:37 +01:00
Trilbyspaceclone 8458340541 Update science.dm 2020-02-04 14:38:24 -05:00
Artur 72f4df82b6 Recompile for tgui next 2020-02-04 13:11:55 +01:00
Artur 614a44ea18 Merge remote-tracking branch 'upstream/master' into TGUI_Next_Crafting 2020-02-04 13:11:02 +01:00
Trilbyspaceclone e237fefbf4 Update science.dm 2020-02-04 06:45:37 -05:00
Artur ed60724a8e Whoops 2020-02-04 12:13:14 +01:00
Artur 0391513220 Works now 2020-02-04 12:05:15 +01:00
CitadelStationBot 8e44f98a83 Automatic changelog generation for PR #10867 [ci skip] 2020-02-04 04:55:24 -06:00
kevinz000 13df3dbb05 Merge pull request #10867 from Ghommie/Ghommie-cit551
Further buff and fix to the clown ops' tearstache grenade.
2020-02-04 03:55:22 -07:00
kevinz000 aa129b9539 Update species.dm 2020-02-04 03:46:13 -07:00
kevinz000 275b1f73e0 Merge pull request #10849 from Ghommie/Ghommie-cit547
Removing a troublesome argument from organ/Remove() in favor or using the 'owner' variable
2020-02-04 03:39:14 -07:00
CitadelStationBot 7924be2534 Automatic changelog generation for PR #10873 [ci skip] 2020-02-04 04:38:34 -06:00
kevinz000 55dafaa5db Merge pull request #10873 from Putnam3145/fix-relief-valve-ui
Updated relief valve UI to tgui-next
2020-02-04 03:38:31 -07:00
CitadelStationBot 0367691bf9 Automatic changelog generation for PR #10865 [ci skip] 2020-02-04 04:35:36 -06:00
kevinz000 66fc2e77f0 Merge pull request #10865 from Ghommie/Ghommie-cit550
Demodularizes and nerfs magnetic rifles/pistols with power cell requirements.
2020-02-04 03:35:33 -07:00
kevinz000 be09322f8e Merge pull request #10882 from Citadel-Station-13/Ghommie-patch-8
Fixes "2048" subtle emotes.
2020-02-04 03:34:52 -07:00
CitadelStationBot 68589e1294 Automatic changelog generation for PR #10872 [ci skip] 2020-02-04 04:34:19 -06:00
kevinz000 f5cd0cf48f Merge pull request #10872 from Arturlang/reflective_ornot
Makes shield no longer block energy projectiles and be destroyed when damaged too much.
2020-02-04 03:34:16 -07:00