Commit Graph
19366 Commits
Author SHA1 Message Date
kevinz000andGitHub de2a3c5502 Merge pull request #10787 from Seris02/snatchgloves
thief's gloves
2020-02-06 23:53:54 -07:00
kevinz000andGitHub 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
kevinz000andGitHub 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
kevinz000andGitHub ae199cee28 Update beam_rifle.dm 2020-02-06 23:49:36 -07:00
kevinz000andGitHub 353c13631a Update beam_rifle.dm 2020-02-06 23:34:33 -07:00
GhomandGitHub e7e13e99b8 Update apc.dm 2020-02-07 07:32:06 +01:00
GhomandGitHub fc1c97b6c6 [s] Prevents some unachievable discounts. 2020-02-07 06:11:20 +01:00
GhomandGitHub 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
Ghommie cd339348c9 Also an unwarranted underscore. 2020-02-07 01:22:32 +01:00
Putnam 0ebd2a814f fixed spurious divide-by-zero 2020-02-06 16:11:14 -08:00
Putnam edcdb531cc kwargs 2020-02-06 15:57:42 -08:00
Putnam e6d353dd01 that's not how switch works... 2020-02-06 15:56:58 -08:00
Putnam d05c2426a8 Added a config for map voting types. 2020-02-06 15:47:04 -08:00
kevinz000andGitHub 62b0e62952 Merge pull request #10623 from Putnam3145/antag-overhaul
Better antag objectives: for real this time
2020-02-06 16:25:22 -07:00
Ghommie 16b655b887 Adds the ELEMENT_DETACH flag to two elements 2020-02-06 23:19:21 +01:00
GhomandGitHub ce6b37da1e Merge pull request #10920 from Arturlang/debbuging
Adds vscode debbuging
2020-02-06 20:33:21 +01:00
GhomandGitHub 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
ArturlangandGitHub 0353f1602d Fixes ore boxes 2020-02-06 20:10:02 +01:00
Artur c9dc35fd9a Updates the debug outfit 2020-02-06 18:42:23 +01:00
kevinz000andGitHub 57f6ad5e87 Update login.dm 2020-02-06 05:46:31 -07:00
kevinz000andGitHub 7898dd089e Merge pull request #10888 from Ghommie/Ghommie-cit554
Ports "Cleans up plante gene mutability."
2020-02-06 00:49:09 -07:00
kevinz000andGitHub 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
kevinz000andGitHub 75d3a8b35d Merge pull request #10868 from Citadel-Station-13/Ghommie-patch-4
Holofans visual tweak.
2020-02-06 00:42:39 -07:00
kevinz000andGitHub 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
kevinz000andGitHub 18910a23a2 Merge pull request #10881 from Ghommie/Ghommie-cit552
Refactoring mob holders into an element.
2020-02-06 00:41:28 -07:00
kevinz000andGitHub 73aa761c69 Merge pull request #10700 from Ghommie/Ghommie-cit526
Anomalous honking crystal pet peeve & co.
2020-02-06 00:38:31 -07:00
kevinz000andGitHub 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
kevinz000andGitHub ead2be5116 Merge pull request #10919 from Ghommie/Ghommie-cit556
Fixing accidental nerfs to the magpistol.
2020-02-06 00:36:59 -07:00
kevinz000andGitHub 3c5a3cb4d4 Merge pull request #10883 from ancientpower/ghost-newscasters
Allows ghosts to read newscasters and books
2020-02-05 23:46:04 -07:00
kevinz000andGitHub 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
kevinz000andGitHub 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
kevinz000andGitHub 50cabc3c64 Merge pull request #10889 from Ghommie/Ghommie-cit555
runtime drifting
2020-02-05 23:44:52 -07:00
kevinz000andGitHub d0cd33a5ea Merge pull request #10899 from Trilbyspaceclone/vender-hate
Almost all venders now can be restocked
2020-02-05 23:44:30 -07:00
kevinz000andGitHub 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
kevinz000andGitHub 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
kevinz000andGitHub 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
GhomandGitHub 181944bb36 Update admin_ranks.dm 2020-02-06 03:07:42 +01:00
r4d6 10490e1c15 3 minutes it is 2020-02-05 21:03:34 -05:00
r4d6 8430ee3684 Timer 2-5 minutes 2020-02-05 20:58:26 -05:00
Hatterhat f100b6c5e4 multitools in basic tools, dumb headers 2020-02-05 19:47:20 -06:00
Ghommie 639ec8066d Another typecheck 2020-02-06 02:19:14 +01:00
Ghommie 60b6d96f45 typecheck. 2020-02-06 02:17:51 +01: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
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
Seris02andGitHub 26e16d7c89 yeet 2020-02-06 07:49:19 +08:00
keronshb 5d1d652ea4 Buffs the Pirate Ship to be bomb proof
Title, also makes a few computers/machines indestructible and buffs turret health.  It also allows turrets to be repairable now.
2020-02-05 18:28:00 -05:00
Ghommie ab06c23a2b runtime is forever, errors are eternal. 2020-02-05 23:48:17 +01:00
23834ce3f5 Parent call
Co-Authored-By: Ghom <42542238+Ghommie@users.noreply.github.com>
2020-02-05 22:54:01 +02:00