Commit Graph

19194 Commits

Author SHA1 Message Date
kevinz000 0337a6402b Update wizard.dm 2020-02-07 03:16:52 -07:00
Ghom 7b23ca3827 Merge pull request #10951 from Citadel-Station-13/kevinz000-patch-10
fail2topic runtime fix
2020-02-07 10:34:55 +01:00
Ghom 2ebf758347 Merge pull request #10950 from Citadel-Station-13/kevinz000-patch-9
beam rifle sanity update
2020-02-07 10:17:14 +01:00
kevinz000 e6f14a085d Update fail2topic.dm 2020-02-07 00:06:32 -07:00
kevinz000 ed2bfb66d8 Update fail2topic.dm 2020-02-07 00:05:21 -07:00
kevinz000 15a59dd729 Merge pull request #10921 from Ghommie/Ghommie-cit557
Lavaland's Herald speech fix.
2020-02-06 23:56:13 -07:00
kevinz000 de2a3c5502 Merge pull request #10787 from Seris02/snatchgloves
thief's gloves
2020-02-06 23:53:54 -07:00
kevinz000 3f5805a9e8 Merge pull request #10798 from necromanceranne/secmainsrejoice
Formal security wear are now armor vests (HAS SOME BALANCE CONCERNS)
2020-02-06 23:52:49 -07:00
kevinz000 4e2e411dd0 Merge pull request #10929 from Ghommie/Ghommie-cit559
Double-esword and hypereuplastic blade toys are now blunt.
2020-02-06 23:51:17 -07:00
kevinz000 ae199cee28 Update beam_rifle.dm 2020-02-06 23:49:36 -07:00
Ghom cee2410091 Merge pull request #10922 from Citadel-Station-13/kevinz000-patch-5
renames the lawyer cartridge to something more accurate to its function
2020-02-07 05:53:09 +01:00
kevinz000 62b0e62952 Merge pull request #10623 from Putnam3145/antag-overhaul
Better antag objectives: for real this time
2020-02-06 16:25:22 -07:00
Ghom ce6b37da1e Merge pull request #10920 from Arturlang/debbuging
Adds vscode debbuging
2020-02-06 20:33:21 +01:00
Ghom cd14f13d0d Merge pull request #10917 from Arturlang/Hyposprays_QOL
Removes the hypospray verb for toggling spray/inject mode and makes it into an Alt click proc.
2020-02-06 20:31:46 +01:00
Arturlang 0353f1602d Fixes ore boxes 2020-02-06 20:10:02 +01:00
kevinz000 7898dd089e Merge pull request #10888 from Ghommie/Ghommie-cit554
Ports "Cleans up plante gene mutability."
2020-02-06 00:49:09 -07:00
kevinz000 fe2007d687 Merge pull request #10870 from Citadel-Station-13/Ghommie-patch-5
Fixed wheelchair-goers appearing as shoeless
2020-02-06 00:43:45 -07:00
kevinz000 75d3a8b35d Merge pull request #10868 from Citadel-Station-13/Ghommie-patch-4
Holofans visual tweak.
2020-02-06 00:42:39 -07:00
kevinz000 542cae89d4 Merge pull request #10906 from Hatterhat/tg-48717-48726
husking is stupid - 5u rezadone/100u synthflesh heals husking, husking takes more burn
2020-02-06 00:42:05 -07:00
kevinz000 18910a23a2 Merge pull request #10881 from Ghommie/Ghommie-cit552
Refactoring mob holders into an element.
2020-02-06 00:41:28 -07:00
kevinz000 73aa761c69 Merge pull request #10700 from Ghommie/Ghommie-cit526
Anomalous honking crystal pet peeve & co.
2020-02-06 00:38:31 -07:00
kevinz000 1288a463cf Merge pull request #10772 from Ghommie/Ghommie-cit537
Removing unused vore files and commented out code.
2020-02-06 00:37:52 -07:00
kevinz000 ead2be5116 Merge pull request #10919 from Ghommie/Ghommie-cit556
Fixing accidental nerfs to the magpistol.
2020-02-06 00:36:59 -07:00
kevinz000 3c5a3cb4d4 Merge pull request #10883 from ancientpower/ghost-newscasters
Allows ghosts to read newscasters and books
2020-02-05 23:46:04 -07:00
kevinz000 e0dd12ecbd Merge pull request #10902 from Citadel-Station-13/Ghommie-patch-1
Fixes some mounted defibrillator issue.
2020-02-05 23:45:45 -07:00
kevinz000 cda01e10f6 Merge pull request #10885 from Ghommie/Ghommie-cit553
Removing a couple troublesome NSFW useless and unused preferences.
2020-02-05 23:45:30 -07:00
kevinz000 50cabc3c64 Merge pull request #10889 from Ghommie/Ghommie-cit555
runtime drifting
2020-02-05 23:44:52 -07:00
kevinz000 d0cd33a5ea Merge pull request #10899 from Trilbyspaceclone/vender-hate
Almost all venders now can be restocked
2020-02-05 23:44:30 -07:00
kevinz000 27d3fcf5fd Merge pull request #10900 from Putnam3145/port-atmos-fix
Ports atmos priority reaction mix from TG
2020-02-05 23:44:08 -07:00
kevinz000 5059c0fa8c Merge pull request #10905 from Hatterhat/engishit
consoleless interfaces default, standard RCD ammo added to industrial engi
2020-02-05 23:43:54 -07:00
kevinz000 51bc7a5dec Merge pull request #10909 from Citadel-Station-13/Ghommie-patch-3
Fixes the panic bunker persistence.
2020-02-05 23:43:05 -07:00
Ghom 181944bb36 Update admin_ranks.dm 2020-02-06 03:07:42 +01:00
Hatterhat f100b6c5e4 multitools in basic tools, dumb headers 2020-02-05 19:47:20 -06:00
Ghommie 8131a60f3a Oh. 2020-02-06 02:10:03 +01:00
Ghommie 523e080f87 Double-esword and hypereuplastic blade toys are sharp now blunt. 2020-02-06 02:09:27 +01:00
Arturlang 23834ce3f5 Parent call
Co-Authored-By: Ghom <42542238+Ghommie@users.noreply.github.com>
2020-02-05 22:54:01 +02:00
Artur 78339881de Wierd ass formatting causing tabs to betray me 2020-02-05 21:37:36 +01:00
kevinz000 98c721fffc Update cart.dm 2020-02-05 13:29:31 -07:00
Ghommie 01d8086ebd Lavaland's Herald speech fix. 2020-02-05 21:12:15 +01:00
Artur c2b68d0ba3 Adds debbuging 2020-02-05 20:35:24 +01:00
Artur 5602289013 Parent call
Failed to get in the previous commit for some reason.
2020-02-05 20:25:04 +01:00
Artur 9951f291fd Reviewer suggestions 2020-02-05 20:14:35 +01:00
Ghom 6d78d01612 Merge pull request #10903 from Hatterhat/tg-47770
fuck organ decay - tgstation#47770
2020-02-05 19:26:40 +01:00
Ghom 69c4cde323 Merge pull request #10915 from Citadel-Station-13/kevinz000-patch-5
jackboot magpistols are a thing again
2020-02-05 19:22:36 +01:00
Ghom deb1686ce2 Merge pull request #10911 from Tupinambis/StunbatonFUCK
Addendum to PR #10812. REGEN STAMINA WHATEVER FUCK COMBAT REWORK IS CONFUSING
2020-02-05 19:19:41 +01:00
Ghommie 7e2ad2b71f Fixing accidental nerfs to the magpistol. 2020-02-05 18:45:15 +01:00
Ghom 7e8bc10b8e Merge pull request #10894 from Trilbyspaceclone/carps
Buffs carps again
2020-02-05 18:32:18 +01:00
Artur 8b5e3e6004 Removes the shitty verb 2020-02-05 14:55:47 +01:00
kevinz000 a45038d214 Update pockets.dm 2020-02-05 03:31:55 -07: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