18273 Commits

Author	SHA1	Message	Date
Ghom	e7b925e779	Merge pull request #10582 from Putnam3145/more_flavor ... Made temp flavor "more" pop up with actual temp flavor	2020-01-17 14:44:04 +01:00
Ghom	c1e9618757	Merge pull request #10565 from Citadel-Station-13/revert-10379-tg-47443-shotgunpbs ... Revert "shotgun pointblanking people actually throws them"	2020-01-16 23:18:37 +01:00
kevinz000	d110d7bae9	Merge pull request #10347 from deathride58/stambufferbuff ... [experimental] Buffs the stamina buffer by making it recharge for free.	2020-01-16 14:51:38 -07:00
Ghom	ca13be3c92	Merge pull request #10456 from Putnam3145/arousal-bad ... Removes arousal damage and replaces it with simpler systems	2020-01-16 13:30:31 +01:00
Putnam	253a3a44ba	moved "aphro" magic string to a define	2020-01-15 20:15:40 -08:00
Putnam	de4e65c467	Savefile conversion for inesct	2020-01-15 20:13:09 -08:00
Ghom	7d9f4f9fe5	Merge pull request #10417 from kevinz000/nightshift_1 ... Nightshift improvements: public area settings/levels, nightshift auth requirement change, config changes, etc etc	2020-01-16 03:21:49 +01:00
Ghom	70c1b0635a	early returns.	2020-01-16 03:14:39 +01:00
kevinz000	554f23e790	aight bet	2020-01-15 18:04:05 -07:00
kevinz000	872628d9aa	Apply suggestions from code review ... thank you gamer Co-Authored-By: Ghom <42542238+Ghommie@users.noreply.github.com>	2020-01-15 18:02:23 -07:00
Putnam	d29603ad77	Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into arousal-bad	2020-01-15 15:57:32 -08:00
Ghommie	4b090f938c	ok	2020-01-15 20:51:36 +01:00
Ghom	7b34daae48	Merge pull request #10563 from Trilbyspaceclone/patch-268 ... Makes fragile suit less likely to brake from toys	2020-01-15 15:51:15 +01:00
Ghom	31c3b0f7bb	Merge pull request #10415 from kevinz000/tg_update_1 ... Small controller/backend updates from /tg/	2020-01-15 15:23:09 +01:00
Ghom	5eb26682e2	Merge pull request #10557 from timothyteakettle/timothyteakettle-gene-modder-1 ... remove trait genes without disks	2020-01-15 14:54:11 +01:00
kevinz000	b0c2e4cbdd	Revert "shotgun pointblanking people actually throws them"	2020-01-15 01:13:26 -07:00
Hatterhat	7b322ff467	Merge branch 'master' into greytide-standard-uniform	2020-01-14 19:39:16 -06:00
Trilbyspaceclone	5351bc9f8a	Update miscellaneous.dm	2020-01-14 19:15:35 -05:00
Ghom	8a06f2f45c	Merge pull request #10499 from Hatterhat/tg-40046 ... more /tg/station ports - tools! logging! some other fun stuff!	2020-01-15 01:05:36 +01:00
Ghom	5dee355381	Merge pull request #10530 from kappa-sama/modularer ... deletes modular items but this time i don't get cucked	2020-01-15 00:47:38 +01:00
Ghommie	26d6e7f05c	Work.	2020-01-14 22:04:38 +01:00
Ghommie	3984943b0d	[s] makes master compile.	2020-01-14 20:02:26 +01:00
Ghom	2cc87c3127	Merge pull request #10531 from Trilbyspaceclone/Seed-to-points ... Hydroponics can now make sci points	2020-01-14 18:26:34 +01:00
Ghom	03ebab6ec5	Merge pull request #10454 from Commandersand/clothsfix ... fixes clothing directional sprites(i swear not all of them are my fault)	2020-01-14 18:24:50 +01:00
TrilbySpaceClone	ccfaa294bc	Update research.dm	2020-01-14 10:40:47 -05:00
Ghom	11cb7357c5	Stop web-editing like that, little one.	2020-01-14 16:22:41 +01:00
kappa-sama	dcfa8df8f1	bye	2020-01-14 09:04:50 -05:00
kappa-sama	17604a672d	epic	2020-01-14 09:04:35 -05:00
Ghom	99a6214d22	Merge pull request #10538 from Putnam3145/chemistry-aaa ... Fixes to chemistry	2020-01-14 13:52:10 +01:00
Ghom	77bdc8ee58	Merge pull request #10558 from DeltaFire15/clockfixes ... Slimepeople can no longer just chill on vitality matrixes	2020-01-14 13:51:03 +01:00
Ghom	9189455fb1	Merge pull request #10549 from Seris02/durathread ... durathread winter coats from hyper	2020-01-14 13:49:53 +01:00
Putnam	21dde64da2	Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into chemistry-aaa	2020-01-14 03:27:03 -08:00
Hatterhat	464b893790	Merge branch 'master' into tg-40046	2020-01-13 23:06:48 -06:00
Seris02	d46f3232f9	tada	2020-01-14 10:57:32 +08:00
timothyteakettle	17ce27bd70	remove trait genes without disks ... botany fix that lets you remove trait genes without having to have a redundant disk inserted	2020-01-13 23:23:49 +00:00
kappa-sama	3f57f30e14	Merge branch 'master' into modularer	2020-01-13 16:32:00 -05:00
Lin	623ab1c661	Merge pull request #10287 from Ghommie/Ghommie-cit492 ... Minor captains closet cleanup.	2020-01-13 21:15:42 +00:00
Ghom	330d96d549	Merge pull request #10409 from kevinz000/isbanned2 ... IT WORKED ON LOCAL	2020-01-13 18:49:46 +01:00
Ghom	3c4d36ddd3	Merge pull request #10478 from Seris02/gorillashuttlesstopping ... Makes the gorilla shuttle emag only	2020-01-13 16:12:26 +01:00
Ghom	984c43116c	Merge pull request #10539 from Savotta/cum ... ports hShark snout from hyper-station-13	2020-01-13 16:07:28 +01:00
Ghom	e87a3d1074	Merge pull request #10507 from LetterN/banjo ... Ports banjo	2020-01-13 14:44:46 +01:00
Letter N	6ace5fc4b3	ell eff	2020-01-13 21:19:21 +08:00
Letter N	450cb2b01a	Merge branch 'master' into banjo	2020-01-13 20:53:30 +08:00
Ghom	7af8579d17	Merge pull request #10550 from deathride58/fixestopicstatusproper ... fixes status topic having a broken cooldown	2020-01-13 13:48:04 +01:00
Ghom	00325e7de6	Merge pull request #10493 from Putnam3145/score-instead ... Makes the post-secret gamemode vote score-based instead of schulze-based	2020-01-13 13:46:39 +01:00
Ghom	ed42ed5a1e	Merge pull request #10551 from Arturlang/mesmerize_quickfiz ... [s]Fixes bloodsucker mesmerize mute	2020-01-13 12:49:13 +01:00
Ghom	942e321b76	Merge pull request #10555 from Arturlang/Lummox_suggestions ... Ports lummoxes suggestions	2020-01-13 12:48:19 +01:00
Artur	e3d3f7b750	Ported	2020-01-13 13:20:55 +02:00
TrilbySpaceClone	43dcb70718	Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into Seed-to-points	2020-01-13 03:27:01 -05:00
Putnam	e412852c8f	Made temp flavor "more" pop up with actual temp flavor	2020-01-12 23:44:49 -08:00