shikix/GS13NG
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
42,089 Commits 5 Branches 0 Tags
60a720eead2c8e15f3aab6ef799c01edaaffe91c
Commit Graph

18497 Commits

Author SHA1 Message Date
Lin 0e01f2826b Merge pull request #14251 from Chiirno/SynthHuskTweak 
Massive synthflesh buff
 2021-02-18 23:34:53 -06:00
Putnam c84dba85dd should also log climaxes (all of them) 2021-02-18 21:31:25 -08:00
Putnam ecc1ff26bb Slightly more logging, whoops added pref 2021-02-18 21:27:59 -08:00
Putnam cbac292731 Adds back aphro, nympho 2021-02-18 21:22:43 -08:00
Letter N 7d39949a2f Merge remote-tracking branch 'origin/master' into rustsql 2021-02-19 12:38:32 +08:00
Letter N 636d6bf32f grr atmos 2021-02-19 10:39:06 +08:00
Letter N 037378eb7d Merge remote-tracking branch 'origin/master' into hardsync-1.5 2021-02-19 10:34:47 +08:00
Letter N 501d33cddd agony 2021-02-19 10:32:24 +08:00
silicons 98d23bb87b Merge pull request #14256 from Adelphon/ppantsg 
Polychromic Pants & Jacket
 2021-02-18 17:41:51 -07:00
silicons 2a6e70941d Update alien.dm 2021-02-18 17:41:27 -07:00
silicons e792d8d61f Update snacks_meat.dm 2021-02-18 17:35:34 -07:00
silicons ce013a5122 Update alien.dm 2021-02-18 17:34:51 -07:00
silicons 14c9fe655c Update eldritch_items.dm 2021-02-18 17:00:28 -07:00
SandPoot 123de14009 upload files 2021-02-18 15:05:39 -03:00
SandPoot f738023097 Revert "Merge branch 'tool_behavior-replacing' of https://github.com/SandPoot/Citadel-Station-13 into tool_behavior-replacing" 
This reverts commit 2e29f30fdf, reversing
changes made to 724910cfab.
 2021-02-18 15:04:46 -03:00
SandPoot 2e29f30fdf Merge branch 'tool_behavior-replacing' of https://github.com/SandPoot/Citadel-Station-13 into tool_behavior-replacing 2021-02-18 15:04:22 -03:00
SandPoot cf2e70671a upload files 2021-02-18 14:47:10 -03:00
SmArtKar 689293428b Update code/modules/tcg/cards.dm 
Co-authored-by: Letter N <24603524+LetterN@users.noreply.github.com>
 2021-02-18 17:44:38 +03:00
SmArtKar 5e8209a6e9 Update code/modules/tcg/cards.dm 
Co-authored-by: Letter N <24603524+LetterN@users.noreply.github.com>
 2021-02-18 17:44:33 +03:00
SmArtKar 21012bf94e oof 2021-02-18 14:39:56 +03:00
SmArtKar b2b7b4ca9a Fucking finally 2021-02-18 14:17:43 +03:00
Lin 8bf3706876 Merge pull request #14249 from Putnam3145/buzz-fuzz-fix 
Set buzz fuzz's addiction threshold to fit the comment
 2021-02-18 00:11:13 -06:00
Lin b0c4fa5755 Merge pull request #14259 from timothyteakettle/log-pierced-reality-examine 
staring into pierced realities is now logged
 2021-02-18 00:01:32 -06:00
Hatterhat 6d28c27f36 aoaoaoaooaoa 2021-02-17 23:24:44 -06:00
Lin 460042bc33 Merge pull request #14248 from shellspeed1/trying-to-make-floor-bots-actually-do-a-decent-job-of-repairs 
Fix for floorbots not placing a plate before placing a floor.
 2021-02-17 17:28:03 -06:00
Lin a27e4ba9e9 Merge pull request #14252 from silicons/pet_peeve 
spellchecks priviledge --> privilege
 2021-02-17 16:57:01 -06:00
Dan-Neposh 2ec2f55eb7 updates fork 2021-02-17 12:03:28 -05:00
SmArtKar fecf879b0c Fixed 2021-02-17 18:54:59 +03:00
SmArtKar 756be084bc Decks are saveable! 2021-02-17 18:50:23 +03:00
Dan-Neposh ace2512812 solves run linter errors 2021-02-17 10:24:37 -05:00
Putnam3145 d1a6fa972f Merge pull request #14254 from BlueWildrose/holodick 
Messages admins of certain holodeck actions
 2021-02-17 07:21:41 -08:00
SmArtKar 015bd0b145 reeee 2021-02-17 17:16:52 +03:00
SmArtKar eae7e36b95 E 2021-02-17 17:16:33 +03:00
SmArtKar 0b3b1cef7a Small QoL changes to TCG 2021-02-17 17:07:15 +03:00
Putnam3145 74e6f9198b Merge pull request #14236 from dzahlus/toxic-objective-removal 
Removes prevent from leaving alive, maroon objective
 2021-02-17 05:35:27 -08:00
silicons e009b9ef5f Merge pull request #14186 from SmArtKar/trading_card_game 
[READY][PORT] Codename: Blue Eyes White Jumpsuit, the Citadel TCG. Part 1
 2021-02-17 01:30:13 -07:00
shellspeed1 303d35074d Another fix for infinite floor tiles 2021-02-16 20:24:50 -08:00
Timothy Teakettle e50073e636 Update eldritch_effects.dm 2021-02-16 20:54:37 +00:00
SmArtKar 598c19996c Oopsie 2021-02-16 19:53:27 +03:00
SmArtKar e4afe49687 Adds card crafting!" 2021-02-16 19:38:48 +03:00
SmArtKar 664f81585b Adds undef 2021-02-16 19:11:04 +03:00
SmArtKar 0e1e3aaaed and more 2021-02-16 18:57:43 +03:00
The0bserver f6721d02b3 Adds chemicals I missed on the first pass. 2021-02-16 09:53:09 -05:00
IronEleven 7ff8b41874 Update spacevine.dm 2021-02-16 09:14:27 -05:00
SmArtKar 799917bc70 and more 2021-02-16 16:24:37 +03:00
SmArtKar 8abce43547 Fixes 2021-02-16 16:04:31 +03:00
SmArtKar 3da4c73fbe Slight changes to balance, new cards 2021-02-16 15:57:05 +03:00
Letter N 7b24456e2d does not exist 2021-02-16 20:33:46 +08:00
Letter N 3f40e353aa Merge remote-tracking branch 'origin/master' into hardsync-1.5 2021-02-16 19:41:53 +08:00
Adelphon 4c6685333b Polychromic Pants & Jacket 2021-02-16 05:24:45 -05:00