2668 Commits

Author	SHA1	Message	Date
Ghommie	a3a2fb03b6	My bad, my bad.	2019-07-14 14:21:28 +02:00
Ghommie	129ca9d71f	Ports "Refactors NODROP flag into TRAIT_NODROP"	2019-07-13 10:27:39 +02: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
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
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	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
kevinz000	1b4df74efb	Merge pull request #8802 from Ghommie/Ghommie-cit101 ... Ports in RPGs for nuke ops, failsafe uplink codes, some carp plushie exploit fix etc.	2019-07-07 02:39:07 -07:00
Ghommie	00879a6e28	Holographic PDA Quickfix!	2019-07-06 03:46:01 +02:00
kevinz000	7544748570	Merge pull request #8790 from deathride58/pryablesleepers ... Tweaks dogborg sleeper insert/resist values, and adds the ability to pry open dogborg sleepers via crowbar	2019-07-05 06:55:18 -07:00
kevinz000	ba74189192	Merge pull request #8768 from Ghommie/Ghommie-cit94 ... New sprites for the some pda cartridges.	2019-07-03 13:47:53 -07:00
kevinz000	e08002ba4f	Merge remote-tracking branch 'origin/master' into kevinz000-patch-2	2019-07-03 09:49:23 -07:00
kevinz000	85534fa1ef	Merge pull request #8793 from Ghommie/Ghommie-cit99 ... Fixes PDA skin preference not saving up.	2019-07-03 05:19:13 -07:00
kevinz000	06f1eb6dcd	Merge pull request #8810 from Trilbyspaceclone/patch-185 ... Corrects Plastitanium total object damage	2019-07-03 05:18:21 -07:00
Ghommie	b2c5e002ec	Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into Ghommie-cit94	2019-07-03 02:50:49 +02:00
Trilbyspaceclone	88c01dd521	I need to take a brake	2019-07-01 16:47:50 -04:00
Ghommie	8c1e6ff66a	Thanks for pointing that out, lolman.	2019-07-01 09:24:35 +02:00
Ghommie	f39a5d2f6a	Ports in RPGs for nuke ops, failsafe uplinks and some carp plushie exploit fix.	2019-06-30 21:53:33 +02:00
Ghommie	c569da5713	Fixes PDA skin preference not saving up.	2019-06-30 17:17:23 +02:00
deathride58	cb5ed2d2cd	Tweaks dogborg sleeper insert/resist values, and adds the ability to pry open dogborg sleepers with a crowbar	2019-06-30 04:29:48 -04:00
kevinz000	cef22b3c5a	Merge pull request #8786 from Sishen1542/jetpacc ... Update jetpack.dm	2019-06-29 22:17:00 -07:00
Sishen	575f70f3b2	Update jetpack.dm	2019-06-30 01:13:37 -04:00
kevinz000	be377c4bda	Merge pull request #8779 from Sishen1542/jetpacc ... Nerfs roundstart carbon jetpacks. TAKE TWO	2019-06-29 20:09:33 -07:00
Sishen	97241cd1e8	jetpacks, take 2	2019-06-29 00:29:49 -04:00
kevinz000	fbbfb02364	Merge pull request #8681 from Ghommie/Ghommie-cit64 ... Fixes vape and its sprites	2019-06-28 20:36:43 -07:00
kevinz000	a6caf4c63f	Merge pull request #8729 from Ghommie/Ghommie-cit79 ... Ports "Removes SSreligion"	2019-06-28 20:30:44 -07:00
kevinz000	7e1522b76b	Merge pull request #8581 from Ghommie/Ghommie-cit42 ... [Ready]Reskinnable PDAs.	2019-06-28 20:30:05 -07:00