Commit Graph

20554 Commits

Author SHA1 Message Date
Kraseo 41e4de9287 fixes telebatons runtiming and not being able to be extended 2020-03-02 02:47:21 +01:00
Kraseo 508511cb86 actually makes contractor pinpointer do things 2020-03-02 01:36:11 +01:00
Ghom 4d4708a6ae Update cloning.dm 2020-03-02 01:28:20 +01:00
Lin bb05b47ead fix flypeople nutrition 2020-03-01 23:35:16 +00:00
Ghom 28c2d27860 Merge pull request #11287 from monster860/patch-1
Allow moaning while in soft crit
2020-03-02 00:13:27 +01:00
Kraseo 648f7793d3 proving to the world i'm retarded one commit line at a time 2020-03-01 23:56:34 +01:00
Kraseo ad8013d839 Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into contracties 2020-03-01 23:39:16 +01:00
Kraseo 7206e5ee6e nearly forgot these as well 2020-03-01 23:31:14 +01:00
Putnam aba8828fd4 Proper supermatter tweaks. 2020-03-01 14:20:15 -08:00
Ghommie efaa99ae27 some dozens lines about PDA/update_overlays and cryopods/MMIs. 2020-03-01 23:17:35 +01:00
Kraseo 5da4e5fbcd parte 5: tgui and javascript torture 2020-03-01 22:57:39 +01:00
Kraseo e3c77f2f5a part 4: the one where i slowly go insane 2020-03-01 22:05:35 +01:00
ancientpower 56ba8ef127 requested changes 2020-03-01 12:45:00 -06:00
Kraseo ab48a6fa16 part 3: do people even read commit logs 2020-03-01 19:14:05 +01:00
Kraseo d93ade7e03 part 2: bloody tendency 2020-03-01 17:37:18 +01:00
Kraseo 38f7821dd6 part 1: battle stream 2020-03-01 16:56:13 +01:00
Ghommie c0ff43f827 ofc, New arguments. 2020-03-01 16:34:43 +01:00
Ghommie b0922dd70d Actually.. 2020-03-01 16:02:58 +01:00
Ghommie 893cca97a3 An old oversight with disease/var/viable_mobtypes. 2020-03-01 15:59:42 +01:00
Arturlang 97c5aa1e24 Maintainer suggestions
Co-Authored-By: Ghom <42542238+Ghommie@users.noreply.github.com>
2020-03-01 16:48:49 +02:00
kevinz000 9a3ddaaf7b Update logging.dm 2020-03-01 07:08:04 -07:00
KathrinBailey d817442f02 It works!
Everything works now.
2020-03-01 13:42:14 +00:00
Ghom 20a5ab895f Merge pull request #11268 from raspyosu/vamp-revamp
ongoing vampire ability balance/rework attempt
2020-03-01 14:39:03 +01:00
Trilbyspaceclone 684b7714db Update hud.dm 2020-03-01 08:21:25 -05:00
Trilbyspaceclone 787edfb2a7 Update recipes_clothing.dm 2020-03-01 08:16:39 -05:00
Ghom 3ec80872f0 Merge pull request #11279 from Hatterhat/tg-45232-lavariver
tgstation 45232 - lava rivers can no longer be plasma'd for basalt
2020-03-01 13:55:03 +01:00
KathrinBailey 72d3572ec3 New sofas added, need to be added to sheet_types.dm still
Backing up the .dmi changes and two comfy chairs.
2020-03-01 11:58:59 +00:00
TrilbySpaceClone 51c675603e ??? 2020-03-01 02:48:13 -05:00
Trilbyspaceclone 71c26c287e Update sheet_types.dm 2020-03-01 01:55:03 -05:00
Trilbyspaceclone 5c2bf70fe7 Update code/game/objects/items/shields.dm
Co-Authored-By: Arturlang <arturpaavooskari.lang@gmail.com>
2020-03-01 00:48:45 -05:00
Trilbyspaceclone 12ea1132c4 Apply suggestions from code review
Co-Authored-By: Ghom <42542238+Ghommie@users.noreply.github.com>
2020-03-01 00:43:34 -05:00
Trilbyspaceclone 65b03d3a4e Update recipes_clothing.dm 2020-03-01 00:32:48 -05:00
raspyosu d00596b49d fix cloak not restoring initial move intent sometimes (maybe) 2020-03-01 00:24:56 -05:00
Trilbyspaceclone cdd97e8547 she 2020-03-01 00:12:45 -05:00
Trilbyspaceclone e2b706961a Turns out this is Rag's PR and not mine
Neet

Co-Authored-By: Ragolution <bloodlust3333@gmail.com>
2020-03-01 00:11:32 -05:00
monster860 899f1bbd88 Allow moaning while in soft crit 2020-02-29 21:02:37 -05:00
Ghom 609dc0e792 Merge pull request #11242 from Kraseo/green-thumb
Adds reagent traits to Lavaland flora + a botany QOL change
2020-02-29 23:03:53 +01:00
Ghom eeb8ec0b90 Merge pull request #11276 from kevinz000/gc_debug
adds and improves some gc debugging stuff
2020-02-29 22:53:58 +01:00
Ghom 295cd2991d Merge pull request #11227 from Putnam3145/salbut-jitter
Gave jittering to salbutamol
2020-02-29 20:42:03 +01:00
Trilbyspaceclone 3c9d592b8a Update miscellaneous.dm 2020-02-29 09:51:40 -05:00
Trilbyspaceclone dd36688e9a Update watercloset.dm 2020-02-29 03:31:42 -05:00
Trilbyspaceclone 612f8d97d5 Update sheet_types.dm 2020-02-29 03:29:08 -05:00
ancientpower f44908dc2e forgot icon state changes 2020-02-29 02:03:25 -06:00
ancientpower 5c5ec541ae Merge branch 'master' into paramedic-tweaks 2020-02-29 01:55:46 -06:00
ancientpower f48e56fe44 thanks mapdiffbot 2020-02-29 01:49:42 -06:00
Hatterhat 727ec433f3 funny story my byond crashes every compile 2020-02-29 01:47:59 -06:00
ancientpower c4113824f7 more fixes 2020-02-29 01:47:19 -06:00
Lin d32cc370ad Merge pull request #11177 from Citadel-Station-13/Ghommie-patch-1
Broom shenanigeans.
2020-02-29 00:22:24 -06:00
Lin 5ee4a355c1 Merge pull request #11178 from Citadel-Station-13/Ghommie-patch-2
Fixing refrigerators locking when closed
2020-02-29 00:21:43 -06:00
Ragolution 49bff8e649 Update ticker.dm
Minor typo
2020-02-29 01:15:16 -05:00