27158 Commits

Author	SHA1	Message	Date
silicons	f1392307d9	Merge pull request #14235 from Vynzill/junglechanges ... Jungle gateway nerf and touch ups: ape edition	2021-02-21 14:52:57 -07:00
silicons	ae63422727	Merge pull request #14269 from Putnam3145/aphro-readd ... More arousal logging; adds back aphro/nympho	2021-02-21 14:50:32 -07:00
silicons	841bb2aac2	Merge pull request #14265 from SandPoot/tool_behavior-replacing ... Tool behavior replacing	2021-02-21 14:48:50 -07:00
Putnam	a26f850f1c	don't push before thinking, kids	2021-02-20 07:41:37 -08:00
Putnam	d6350b2e75	undergarment logging too	2021-02-20 07:41:11 -08:00
Putnam	c24c339718	Fixed a runtime might cause issues. ... This might also break logging completely, which, why. This isn't a high-priority log, though, so.	2021-02-20 07:36:46 -08:00
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
Timothy Teakettle	7c00a9723d	Revert "test" ... This reverts commit 7b8b16dc22.	2021-02-19 23:09:57 +00:00
Timothy Teakettle	7b8b16dc22	test	2021-02-19 22:19:00 +00: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
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
Lin	dbcc95ea28	Merge pull request #14262 from timothyteakettle/lawyer-message-all-href ... stops people using Message All on PDAs when their cartridge doesn't allow it	2021-02-18 23:34:11 -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
Timothy Teakettle	746ca01823	Update code/game/objects/items/devices/PDA/PDA.dm ... Co-authored-by: Letter N <24603524+LetterN@users.noreply.github.com>	2021-02-19 02:10:03 +00:00
silicons	98d23bb87b	Merge pull request #14256 from Adelphon/ppantsg ... Polychromic Pants & Jacket	2021-02-18 17:41:51 -07:00
silicons	14c9fe655c	Update eldritch_items.dm	2021-02-18 17:00:28 -07:00
SandPoot	69af7d35f8	Update remote_materials.dm	2021-02-18 15:16:40 -03: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	3b9f1cb4ec	Merge pull request #14239 from Hatterhat/golem-gps-pass2 ... well that's what i get for trusting my own code - makes golem GPSes start off, but actually this time	2021-02-17 17:29:03 -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
Timothy Teakettle	96d80901e4	Update PDA.dm	2021-02-17 17:26:45 +00: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
Putnam3145	d1a6fa972f	Merge pull request #14254 from BlueWildrose/holodick ... Messages admins of certain holodeck actions	2021-02-17 07:21:41 -08:00