2700 Commits

Author	SHA1	Message	Date
kevinz000	c657244d9b	Merge pull request #8920 from Ghommie/Ghommie-cit149 ... Towels.	2019-07-20 12:06:54 -07:00
kevinz000	ab3c5acb0e	Merge pull request #8829 from BurgerLUA/NO-MORE-FETISH-CONTENT ... Changeling Transformation Sting (transforming others) is now temporary, just like this server's love for transformation fetishes	2019-07-20 11:59:05 -07:00
kevinz000	08fd6af7fc	Merge pull request #8830 from Ghommie/Ghommie-cit114 ... Ports the toggleable dark mode to the game!	2019-07-20 11:57:13 -07:00
Ghommie	589cdae0e1	Towels	2019-07-18 00:03:49 +02:00
deathride58	9ebdad68b7	Merge pull request #8892 from Citadel-Station-13/kevinz000-patch-61 ... Fixes RPD infinite transit tube stacking	2019-07-17 17:47:09 -04:00
BurgerLUA	03ef2c5257	Merge branch 'master' into NO-MORE-FETISH-CONTENT	2019-07-17 14:17:33 -07:00
kevinz000	b134d23ea3	Merge pull request #8882 from Trilbyspaceclone/slaggy ... Adds discount plushies and a way to get random plushies at shift start	2019-07-17 00:50:21 -07:00
kevinz000	c06d495731	Merge pull request #8877 from BurgerLUA/REMOVE-C8A5DC ... REMOVE #C8A5DC. COLOR STRONG.	2019-07-14 14:48:49 -07:00
kevinz000	1564f38ff8	Merge pull request #8725 from Trilbyspaceclone/meme_tools ... Adds more bronze tools	2019-07-14 14:48:27 -07:00
kevinz000	2c41141d2f	Merge pull request #8676 from Trilbyspaceclone/patch-176 ... Adds a Rapier for 8 Trilby cats	2019-07-14 14:46:44 -07:00
kevinz000	da8b43f054	Merge pull request #8785 from Trilbyspaceclone/Just_Smile! ... Makes Clowns and HonkMother Chaplins smile!	2019-07-14 14:11:09 -07:00
kevinz000	2ec5d3f02e	Merge pull request #8886 from Ghommie/Ghommie-cit137 ... Ports "Refactors NODROP flag into TRAIT_NODROP"	2019-07-14 14:05:20 -07:00
Ghommie	a3a2fb03b6	My bad, my bad.	2019-07-14 14:21:28 +02:00
kevinz000	395b89d0a1	Update RPD.dm	2019-07-14 03:42:26 -07:00
kevinz000	b153294a24	Merge pull request #8857 from Ghommie/Ghoomie-cit127 ... Refactoring underwear to allow custom color preferences.	2019-07-14 03:38:45 -07:00
kevinz000	2259ea2e1c	Merge pull request #8874 from Ghommie/Ghommie-cit132 ... Ports the Chem Master choose your pill PR plus post-improvements	2019-07-14 03:33:37 -07:00
Ghommie	129ca9d71f	Ports "Refactors NODROP flag into TRAIT_NODROP"	2019-07-13 10:27:39 +02:00
TrilbySpaceClone	b2345b19ce	critcal	2019-07-12 21:21:52 -04:00
kevinz000	c012418cf7	Merge pull request #8734 from Ghommie/Ghommie-cit84 ... Sort of porting "Changes the type pathing of some "random" items"	2019-07-12 07:43:12 -07:00
kevinz000	280aa9da08	Merge pull request #8860 from Trilbyspaceclone/Zelus_oil ... Zelus oil - CWC gear	2019-07-12 07:41:28 -07:00
kevinz000	57891813db	Merge pull request #8847 from Ghommie/Ghommie-cit123 ... Porting in two bar signs.	2019-07-12 07:36:29 -07:00
kevinz000	650842b384	Merge pull request #8854 from Ghommie/Ghommie-cit126 ... Stamina damage melee weaponry fixes.	2019-07-12 07:36:01 -07:00
kevinz000	e5d445c4d3	Merge pull request #8846 from Ghommie/Ghommie-cit122 ... Rubber toolboxes.	2019-07-12 07:35:25 -07:00
kevinz000	e26277b67c	Merge pull request #8872 from deathride58/lightermops ... Janitors are no longer diabetic - nerfs mop stamina usage to be in-line with how much effort mopping takes IRL	2019-07-12 07:35:04 -07:00
kevinz000	1eaddd3ebf	Merge pull request #8853 from Ghommie/Ghommie-cit125 ... Ports "Cleans up saycode by removing random hook stubs and using a signal where relevant"	2019-07-12 07:34:19 -07:00
kevinz000	bb568d633b	Merge pull request #8852 from Tupinambis/CursedPlush ... Removes a plush representing the character of an underage player.	2019-07-12 07:32:29 -07:00
BurgerLua	5bd2f28d69	Removed #C8A5DC	2019-07-12 01:02:43 -07:00
Ghommie	d36bae06a7	Ports the Chem Master choose your pill PR plus post-improvements	2019-07-12 07:39:17 +02:00
Tupinambis	cc901128c4	Oops I broke descriptions and sounds. Let me fix that.	2019-07-11 18:03:32 -05:00
deathride58	8d4c3b8ce9	Janitors are no longer diabetic - nerfs mop stamina usage to be more in-line with how much effort mopping takes IRL	2019-07-11 18:37:59 -04:00
Ghommie	92fadcf230	Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into Ghommie-cit84	2019-07-11 09:07:11 +02:00
Ghommie	143410c176	Blame Poojawa for the issue.	2019-07-11 07:39:29 +02:00
kevinz000	564904adf0	Merge pull request #8761 from Trilbyspaceclone/patch-187 ... [Ready] Tweaks shields	2019-07-10 22:02:19 -07:00
TrilbySpaceClone	54c28b19af	Zelus indeed	2019-07-10 02:29:42 -04:00
Ghommie	ba7c24a0ec	Refactoring underwear to allow custom color preferences.	2019-07-09 23:25:54 +02:00
Ghommie	9cf2dea999	Grille spam.	2019-07-09 08:35:32 +02:00
Ghommie	3546ed9799	Stamina damtype weaponry fixes.	2019-07-09 08:33:43 +02:00
Ghommie	490ae9daf2	Ports "Cleans up saycode by removing random hook stubs and using a signal where relevant"	2019-07-09 07:58:22 +02:00
Tupinambis	8c0c80fc39	Removes references to the character of another underage player.	2019-07-09 00:02:16 -05:00
Tupinambis	0057ac7c5c	Removed a plush representing the character of a player that was banned for being underaged.	2019-07-08 22:23:16 -05:00
Ghommie	5b97a7533d	it only affects maploaded items anyway.	2019-07-09 04:34:13 +02:00
Trilbyspaceclone	22cb46cb22	Update shields.dm	2019-07-08 20:30:46 -04:00
deathride58	b8229b365c	Merge pull request #8655 from Citadel-Station-13/kevinz000-patch-2 ... Fixes RLD icon	2019-07-08 18:12:02 -04:00
deathride58	b8e34d1cab	Merge pull request #8704 from Citadel-Station-13/kevinz000-patch-12 ... [s] RCD logging	2019-07-08 18:07:27 -04:00
deathride58	d218739bf8	Merge pull request #8740 from Ghommie/Ghommie-cit87 ... ports "More variety for dorms bedsheets" + 3 new bed sheets.	2019-07-08 18:06:11 -04:00
Ghommie	3ce1497ef2	Ports in two bar signs.	2019-07-08 17:02:08 +02:00
Ghommie	bd9fa27ca1	Now it's tested.	2019-07-08 16:24:26 +02:00
Ghommie	9d35584e58	fixes uninteractable toolboxes.	2019-07-08 15:34:19 +02:00
Ghommie	9043402483	Rubber toolboxes.	2019-07-08 14:34:14 +02:00
kevinz000	d61732472c	Merge pull request #8831 from Ghommie/Ghommie-cit115 ... Holographic PDA Quickfix!	2019-07-07 11:08:15 -07:00