Commit Graph
20372 Commits
Author SHA1 Message Date
97c5aa1e24 Maintainer suggestions
Co-Authored-By: Ghom <42542238+Ghommie@users.noreply.github.com>
2020-03-01 16:48:49 +02:00
kevinz000andGitHub 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
GhomandGitHub 20a5ab895f Merge pull request #11268 from raspyosu/vamp-revamp
ongoing vampire ability balance/rework attempt
2020-03-01 14:39:03 +01:00
GhomandGitHub 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
TrilbyspacecloneandGitHub 71c26c287e Update sheet_types.dm 2020-03-01 01:55:03 -05:00
5c2bf70fe7 Update code/game/objects/items/shields.dm
Co-Authored-By: Arturlang <arturpaavooskari.lang@gmail.com>
2020-03-01 00:48:45 -05:00
12ea1132c4 Apply suggestions from code review
Co-Authored-By: Ghom <42542238+Ghommie@users.noreply.github.com>
2020-03-01 00:43:34 -05:00
raspyosu d00596b49d fix cloak not restoring initial move intent sometimes (maybe) 2020-03-01 00:24:56 -05:00
TrilbyspacecloneandGitHub cdd97e8547 she 2020-03-01 00:12:45 -05:00
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
monster860andGitHub 899f1bbd88 Allow moaning while in soft crit 2020-02-29 21:02:37 -05:00
GhomandGitHub 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
GhomandGitHub eeb8ec0b90 Merge pull request #11276 from kevinz000/gc_debug
adds and improves some gc debugging stuff
2020-02-29 22:53:58 +01:00
GhomandGitHub 295cd2991d Merge pull request #11227 from Putnam3145/salbut-jitter
Gave jittering to salbutamol
2020-02-29 20:42:03 +01:00
TrilbyspacecloneandGitHub 3c9d592b8a Update miscellaneous.dm 2020-02-29 09:51:40 -05:00
TrilbyspacecloneandGitHub dd36688e9a Update watercloset.dm 2020-02-29 03:31:42 -05:00
TrilbyspacecloneandGitHub 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
ancientpowerandGitHub 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
LinandGitHub d32cc370ad Merge pull request #11177 from Citadel-Station-13/Ghommie-patch-1
Broom shenanigeans.
2020-02-29 00:22:24 -06:00
LinandGitHub 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
RagolutionandGitHub 49bff8e649 Update ticker.dm
Minor typo
2020-02-29 01:15:16 -05:00
LinandGitHub 70e2563579 Merge pull request #11266 from Ghommie/Ghommie-cit593
Fixing another couple mob holder oversights.
2020-02-29 00:13:58 -06:00
LinandGitHub 5ba6320f5e Merge pull request #11261 from Ghommie/Ghommie-cit591
Fixing escaped characters in flavor texts.
2020-02-29 00:12:35 -06:00
Ragolution 763fee141d Adds new audio file to defines in ticker for round-end sounds.
hello ticker my old friend
ive come to fuck with you again
the memes to my mind, slowly creeping
shitposts when i should probably be sleeping

and the question
that was planted in my brain
still remains

why the fuck is this in the /ticker/
2020-02-29 01:11:20 -05:00
LinandGitHub a3eef43445 Merge pull request #11263 from Citadel-Station-13/Ghommie-patch-3
Removes extra unwarranted paramedic access.
2020-02-29 00:11:16 -06:00
Hatterhat 1577a00ab5 tg 45232 2020-02-28 21:54:55 -06:00
kevinz000andGitHub ba55351e4a Update twohanded.dm 2020-02-28 13:43:11 -07:00
kevinz000 93d91b1808 Merge remote-tracking branch 'citadel/master' into sword_point 2020-02-28 13:39:56 -07:00
kevinz000 8ef68fa36b En garde! 2020-02-28 13:35:41 -07:00
kevinz000 4b9dfdf476 types 2020-02-28 13:24:39 -07:00
kevinz000andGitHub c5edeb9913 Merge pull request #11265 from Citadel-Station-13/Ghommie-patch-4
Cogchamp mixing sound made less annoyingly long.
2020-02-28 12:41:05 -07:00
raspyosu 5b6da0b350 ok
changes that artur suggested guess it makes no sense to add too much flavor
2020-02-28 13:29:36 -05:00
GhomandGitHub d5c2c54f32 Update fancy.dm 2020-02-28 19:14:58 +01:00
ancientpower ed320046c5 fixes icons 2020-02-28 11:42:15 -06:00
GhomandGitHub c9a5f49623 Fixing a whoopsie with airlocks. 2020-02-28 17:28:02 +01:00
kevinz000 7f7dced8b0 no message for automated 2020-02-28 06:15:08 -07:00
kevinz000andGitHub e39d7fa49d Merge pull request #11259 from Ghommie/Ghommie-cit590
Porting update_icon improvements.
2020-02-28 04:30:12 -07:00
kevinz000andGitHub 25f86c18d1 Merge pull request #11260 from Kraseo/i-hate-gangs
Removes soporific sniper rifle rounds from gang uplinks
2020-02-28 04:29:22 -07:00
kevinz000andGitHub d0eebdbb02 Merge pull request #11273 from Arturlang/blob_broacast_exploit
[s] Fixes blob broadcast HTML Injection.
2020-02-28 04:28:41 -07:00
Artur c6fcffe949 Made the same mistake... 2020-02-28 13:19:27 +02:00
Artur d6e402aa5d Damned 2020-02-28 13:06:28 +02:00
kevinz000andGitHub a2970b5746 Update living.dm 2020-02-28 02:40:51 -07:00
ancientpower 23c3e5b328 tweaks for the tweaks 2020-02-28 00:17:28 -06:00
raspyosu 8953877a69 makes mesmerize not shitcode
woooooooo
2020-02-28 01:01:45 -05:00