Commit Graph

12930 Commits

Author SHA1 Message Date
Ghom 4cdade4b2d Merge pull request #10788 from Seris02/crushboots
crushing magboots for tators
2020-02-05 07:36:14 +01: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 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
Trilbyspaceclone 1547f99ddb Update carp.dm 2020-02-05 00:59:16 -05: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
Ghom 57ac5c3d66 Update carp.dm 2020-02-05 06:12:57 +01:00
Hatterhat bad4b5cb56 huskies 2020-02-04 22:13:03 -06:00
Trilbyspaceclone 4ecbd1e407 Update carp.dm 2020-02-04 22:00:33 -05:00
Trilbyspaceclone fb2498781c Update carp.dm 2020-02-04 20:29:50 -05:00
Ghom b4ba381b59 Merge pull request #10739 from r4d6/Dwarven_Language
Add a Dwarf Language
2020-02-05 02:03:42 +01:00
Hatterhat 6efe0dc273 haha what if i made everything interfacable 2020-02-04 18:55:19 -06:00
Hatterhat 385aea3d14 rcd ammo to indeng, typo 2020-02-04 18:50:09 -06:00
Hatterhat fe717597da fuck fermichem 2020-02-04 18:35:26 -06:00
ancientpower dd521ef009 i swear it compiled locally 2020-02-04 17:18:13 -06:00
ancientpower 5fb82a2e6b fixes for the requested changes' fixes 2020-02-04 17:10:02 -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
ancientpower 335c28ff25 fixes for the requested changes 2020-02-04 17:02:13 -06:00
ancientpower a85f05a628 requested changes 2020-02-04 16:58:24 -06:00
ancientpower 0d6ffbc432 fixed it for real this time 2020-02-04 16:38:20 -06:00
Putnam d2f1069764 Ported atmos reaction priority fix 2020-02-04 14:32:39 -08:00
ancientpower 6342116168 forgot to remove this bit 2020-02-04 16:13:28 -06:00
ancientpower 9dd411f11b fixes the restoration for reals 2020-02-04 16:11:12 -06:00
ancientpower 524836c2b2 restores drink flinging 2020-02-04 15:48:03 -06:00
Trilbyspaceclone b7613a43ae corrects this missing sprite 2020-02-04 16:23:36 -05:00
TrilbySpaceClone 06fd6645b3 And it wokrs 2020-02-04 16:01:22 -05:00
Ghom c24ffa8f1c Merge pull request #10840 from Putnam3145/easier_bunker
Save panic bunker between rounds
2020-02-04 21:15:37 +01:00
Ghom fc7c900cde Update death.dm 2020-02-04 20:51:01 +01:00
Ghom 56ef22f472 Update death.dm 2020-02-04 20:49:49 +01:00
Trilbyspaceclone 8458340541 Update science.dm 2020-02-04 14:38:24 -05:00
TrilbySpaceClone f66d401516 forgot to move the var 2020-02-04 07:16:15 -05:00
Artur 614a44ea18 Merge remote-tracking branch 'upstream/master' into TGUI_Next_Crafting 2020-02-04 13:11:02 +01:00
TrilbySpaceClone 4842e29c2e buffs carps again 2020-02-04 07:09:50 -05:00
Trilbyspaceclone e237fefbf4 Update science.dm 2020-02-04 06:45:37 -05:00
Artur 0391513220 Works now 2020-02-04 12:05:15 +01: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 8db3fbdf88 modularize out taser rework 2020-02-04 03:49:09 -07:00
kevinz000 8556a6188f Merge remote-tracking branch 'citadel/master' into small_guncode_refactor 2020-02-04 03:47:01 -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
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
kevinz000 ab696ac50a Merge pull request #10847 from Citadel-Station-13/Ghommie-patch-2
Fixes Space Ninja "Nothing" Objective.
2020-02-04 03:33:55 -07:00
kevinz000 b34d6cba0c Merge pull request #10864 from Citadel-Station-13/Ghommie-patch-1
Hello subtler roleplayers, I see you.
2020-02-04 03:33:14 -07:00
kevinz000 d5a44097a3 Merge pull request #10862 from Hatterhat/boy-i-fucked-up-that-examine
seed extractor examine tweak/fix
2020-02-04 03:32:57 -07:00
Artur 0452286468 Fixes no thrall bloodcost 2020-02-04 11:21:47 +01:00
kevinz000 97583bd98f Merge pull request #10853 from Ghommie/Ghommie-cit549
A PR about runtime errors
2020-02-04 03:20:34 -07:00
Seris02 49f80d52a8 bug fixes 2020-02-04 17:18:45 +08:00
Ghom d451115bf1 Merge pull request #10854 from Seris02/meteoralertchange
Makes a proc for meteor string gen
2020-02-04 08:15:32 +01:00
Ghommie a0caada859 runtime drifting 2020-02-04 08:05:27 +01:00