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

18815 Commits

Author SHA1 Message Date
silicons
293404f728 Merge pull request #14258 from IronEleven/IronEleven-patch-1 
Raises Space Vine Population Requirement
 2021-02-20 03:02:24 -07:00
silicons
ecad553fe2 Merge pull request #14263 from Hatterhat/metabreak-b-gon 
the one where i make anomaly announcements and brand intelligence always announce
 2021-02-20 03:02:06 -07:00
silicons
e36794d0f5 Merge pull request #14271 from shellspeed1/revert-14248-trying-to-make-floor-bots-actually-do-a-decent-job-of-repairs 
Revert "Fix for floorbots not placing a plate before placing a floor."
 2021-02-20 02:59:16 -07:00
silicons
7fdcacdf19 Merge pull request #14272 from MrJWhit/random-port 
Port of "removes unnecessary %"
 2021-02-20 02:58:19 -07:00
silicons
cabc471d92 Merge pull request #14273 from timothyteakettle/chaplain-vampire 
chaplain vampires won't burn in their own chapel now
 2021-02-20 02:58:06 -07:00
silicons
030f8ad681 Merge pull request #14261 from SmArtKar/tcg_qol 
[READY] Small QoL changes to TCG
 2021-02-19 13:37:10 -07:00
Timothy Teakettle
9528cc9ce4 woops i left that in 2021-02-19 19:36:19 +00:00
Timothy Teakettle
94ad05b2bc better idea 2021-02-19 17:14:36 +00:00
Timothy Teakettle
9de5e5f5fa Update vampire.dm 2021-02-19 17:07:41 +00:00
MrJWhit
ea47ab1610 Update seed_extractor.dm 2021-02-19 10:00:43 -05:00
shellspeed1
f17be50d5f Revert "Fix for floorbots not placing a plate before placing a floor." 2021-02-18 23:28:10 -08:00
Letter N
6abad913ff the sqel 2021-02-19 14:52:18 +08:00
Putnam
257cd6bb34 keyword argument funnies, whoops comma 2021-02-18 21:55:28 -08:00
Lin
d2f9237ecd Merge pull request #14237 from Citadel-Station-13/silicons-patch-11 
adds sanity checks to heretic blade shatters
 2021-02-18 23:51:23 -06:00
Putnam
990df7df37 added exposure logging 2021-02-18 21:36:54 -08:00
Lin
1acd81c036 Merge pull request #14246 from TyrianTyrell/master 
Multilingual conditions fix.
 2021-02-18 23:36:20 -06:00
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
3ef52e039f Update alien.dm 2021-02-18 17:29:40 -07:00
silicons
21ffcc0318 Update alien.dm 2021-02-18 17:27:44 -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