shikix/GS13NG
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
31,196 Commits 5 Branches 0 Tags
6d91a5da7a4e01c32a96f8c4e23dfa5ed9bf4f47
Commit Graph
20186 Commits
Author SHA1 Message Date
GhomandGitHub 15fed0386c Update lizard.dm 2020-03-02 22:56:15 +01:00
GhomandGitHub c984cd7677 Merge pull request #11270 from ancientpower/paramedic-tweaks 
Paramedic tweaks (sprites/access/stuff for future use)
 2020-03-02 22:46:49 +01:00
Putnam 3cba19dea7 Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into stop-lag 2020-03-02 11:24:49 -08:00
Putnam eefba5ce00 Removes lag 2020-03-02 11:24:46 -08:00
kevinz000andGitHub 6c8154e8e1 Update damage_procs.dm 2020-03-02 12:13:36 -07:00
GhomandGitHub 00bc635d27 Merge pull request #11296 from Putnam3145/supermatter-hardcap 
Proper supermatter tweaks
 2020-03-02 16:36:58 +01:00
GhomandGitHub 9375113426 Merge pull request #11041 from Arturlang/kills_blood_tomatoe_succ 
Bloodsucker external blood gain rebalancing
 2020-03-02 16:36:22 +01:00
GhomandGitHub 782f992c8c Merge pull request #11271 from Citadel-Station-13/kevinz000-patch-19 
Pushing stuff now checks for Process_Spacemove on the automatic step
 2020-03-02 16:34:18 +01:00
GhomandGitHub 4ed92ff03a Merge pull request #11283 from Trilbyspaceclone/patch-299 
Makes most winter coats and hoods have their own desc
 2020-03-02 16:18:47 +01:00
GhomandGitHub fca911b74f Merge pull request #11281 from Ragolution/master 
Just another round-end sound.
 2020-03-02 16:17:37 +01:00
kevinz000andGitHub 1a87a9d051 Update damage_procs.dm 2020-03-02 07:24:02 -07:00
kevinz000andGitHub e1f3985309 Update musician.dm 2020-03-02 05:33:48 -07:00
kevinz000andGitHub 92e95f816a Update defib.dm 2020-03-02 03:49:21 -07:00
kappa-samaandGitHub ec3e2ddb24 no more laptop slowdown 2020-03-01 21:17:48 -05:00
LinandGitHub bb05b47ead fix flypeople nutrition 2020-03-01 23:35:16 +00:00
GhomandGitHub 28c2d27860 Merge pull request #11287 from monster860/patch-1 
Allow moaning while in soft crit
 2020-03-02 00:13:27 +01:00
Putnam aba8828fd4 Proper supermatter tweaks. 2020-03-01 14:20:15 -08:00
ancientpower 56ba8ef127 requested changes 2020-03-01 12:45:00 -06: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
ArturlangGitHubGhom
 		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
TrilbyspacecloneGitHubGhom
 		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
TrilbyspacecloneGitHubRagolution
 		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
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