shikix/GS13NG
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
32,734 Commits 5 Branches 0 Tags
bcf77458dd5639ba27f07dd4acb0a174aa562dbb
Commit Graph

21280 Commits

Author SHA1 Message Date
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
Ghom
aa79b9853b Update living.dm 2020-03-01 15:42:41 +01:00
Ghommie
185a0b092e I hate this. 2020-03-01 15:33:46 +01: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
Putnam
7a5366f5dd come to think of it a "cooperative", huh 2020-03-01 00:03:12 -08:00
Putnam
6e7406a51a what 2020-03-01 00:03:00 -08:00
Putnam
56ab702fa5 but how 2020-03-01 00:02:16 -08:00
TrilbySpaceClone
51c675603e ??? 2020-03-01 02:48:13 -05:00
Putnam
31b9dbd4ab Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into traitor-types 2020-02-29 23:30:36 -08:00
Putnam
f344af633f finalized. 2020-02-29 23:29:24 -08: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
Ghommie
31bde973e0 Bad. 2020-02-29 15:44:05 +01:00
Ghommie
bcc1c954c8 Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into Ghommie-cit595 2020-02-29 15:16:43 +01:00
Ghommie
bd87d46ce6 Deletes the preferences_vore datum and migrates its contents to preferences. 2020-02-29 15:07:44 +01: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
Lin
70e2563579 Merge pull request #11266 from Ghommie/Ghommie-cit593 
Fixing another couple mob holder oversights.
 2020-02-29 00:13:58 -06:00
Lin
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
Lin
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
kevinz000
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