4545 Commits

Author	SHA1	Message	Date
variableundefined	3c98bf5799	Merge pull request #9710 from SamHPurp/de-specifying ... Reduces incorrect use of station names.	2018-10-07 22:52:27 +08:00
Purpose	63dfd411aa	Resolved merge conflicts... I hope.	2018-10-06 16:01:34 +01:00
Purpose	ea74920535	no no no no cyberiaaaaad	2018-10-05 20:57:41 +01:00
Purpose	6cb07cb70c	Fixes a bunch of shown messages	2018-09-29 19:10:10 +01:00
Purpose	c82cd93a89	Merge branch 'master' into Refactors-beds-stools-chairs	2018-09-29 15:36:27 +01:00
variableundefined	68c35ccced	Merge pull request #9527 from Ty-Omaha/muh-art ... Fixes half the server crashing, removes canvases	2018-09-29 07:49:30 +08:00
nicetoolbox	fdc7297954	Reveal speaker identity when using megaphone	2018-09-27 20:36:13 -07:00
Fox McCloud	c187559e83	Merge pull request #9599 from Agameofscones/lipstickcodefix ... Jade lipstick color fix (and minor refactor)	2018-09-27 17:48:15 -04:00
Gwydion Brain	d426ed1879	Adds comments and loadout	2018-09-27 14:17:32 -07:00
tigercat2000	59fba23456	Merge pull request #9524 from alex-gh/autopsy_time_fix ... Autopsy scanner now prints all times in human readable format.	2018-09-26 21:36:23 -07:00
Crazy Lemon	4991d152af	Merge pull request #8811 from FalseIncarnate/kitchen ... Mixing Bowls and Kitchen refactors	2018-09-26 17:32:39 -07:00
Crazy Lemon	ae68d43d46	Merge pull request #9032 from Anasari/CabinetDecon ... Allow you to construct & deconstruct fire extinguisher cabinet	2018-09-26 17:31:15 -07:00
Crazy Lemon	f863b792bd	Merge pull request #9601 from variableundefined/DropLocation ... Adds in drop_location & AllowDrop()	2018-09-26 17:00:11 -07:00
Crazy Lemon	d3505ea9b9	Merge pull request #9543 from nicetoolbox/changeling-grab-fix ... Fix changeling tentacle grab	2018-09-26 16:25:25 -07:00
Gwydion Brain	3e4c7b476b	I have no idea how this works	2018-09-24 23:06:21 -07:00
Dedhia	524fdef17b	General Fix	2018-09-24 20:36:17 -07:00
Dedhia	f68cf60f58	Fixes #9607	2018-09-24 15:16:16 -07:00
variableundefined	a499b0fc68	Paving the path for a bigger inventory refactor	2018-09-23 22:26:10 +08:00
Gwydion Brain	74ffb9bbdb	Refactors lipstick ... New variable [stickprefix] so RGB codes can be called on all color variants	2018-09-23 01:37:09 -07:00
Gwydion Brain	f0b2c596e1	Initial ... Fixes jade lipstick being lime. Adds lime lipstick.	2018-09-22 21:39:14 -07:00
nicetoolbox	385f290bc3	Clean up some grabs	2018-09-16 12:28:39 -07:00
Purpose	efbcd54cf2	Fully refactors Chairs, Stools & Beds. Adds a few fun bits	2018-09-14 18:40:42 +01:00
Ty-Omaha	28acdb1e56	removes canvases 2 ... fully removes it as per tiger's critique	2018-09-12 02:40:32 -04:00
alex-gh	b59aa8cb75	Autopsy scanner now prints all times in human readable format.	2018-09-11 17:39:05 +02:00
Fox McCloud	6832dbe74e	Merge pull request #9373 from variableundefined/walletdecal ... Wallet icon defaults to green if it is filled with an id of any type	2018-09-09 18:09:56 -04:00
Crazy Lemon	847ef225d0	Merge pull request #9479 from datlo/megaphonevoicefix ... Fixes #8439, adds font check to the megaphone	2018-09-04 10:22:42 -07:00
Crazy Lemon	7f86521753	Merge pull request #9283 from Aurorablade/PlasmaIsGrifingMe ... Adds some Logging to some items	2018-09-04 09:23:11 -07:00
Crazy Lemon	5f11e5945e	Merge pull request #9367 from TDSSS/hypospray-belt ... Allows medical belts to hold hyposprays	2018-09-04 09:21:37 -07:00
datlo	5c3aeef45e	replace locate check	2018-09-04 11:47:15 +01:00
datlo	0418e51a21	Adds font check to the megaphone ... Megaphone now carries over the user's font (wingdings, comic sans, and any other font in mind.speech_span)	2018-09-03 16:32:20 +01:00
Unknown	62c7ba1f80	Merge remote-tracking branch 'upstream/master' into Memes	2018-08-29 19:23:06 +02:00
Crazy Lemon	e8e5928edd	Merge pull request #9430 from FlattestGuitar/forceMove ... you can remove items from storage with forceMove() properly	2018-08-29 08:29:26 -07:00
variableundefined	b874549978	Ensure bola cannot snare anyone without enough legs	2018-08-28 22:35:31 +08:00
Unknown	b89eec6ce6	forceMove for storage item removal	2018-08-28 10:22:45 +02:00
TDSSS	503f9b9166	Fixed indentation	2018-08-23 12:34:06 +02:00
Anasari	a135d01835	Fixes	2018-08-23 14:47:43 +08:00
Crazy Lemon	195e199552	Merge pull request #9061 from Anasari/TGRefundPort ... Port over Fox's refactored syndicate item refund from TG.	2018-08-22 22:51:12 -07:00
Crazy Lemon	d59d2e76be	Merge pull request #9303 from Kyep/teleport_fixes ... Teleportation Fixes	2018-08-22 22:44:18 -07:00
Aurorablade	b7002a414f	Removes a leading var	2018-08-23 01:38:56 -04:00
Crazy Lemon	058d339493	Merge pull request #9336 from Kyep/depot_fixes_1 ... Depot Fixes	2018-08-22 22:33:09 -07:00
Crazy Lemon	b3f5af433a	Merge pull request #9371 from variableundefined/DefibPaddleDetach ... Defib paddles snap away if you walk away from the defib	2018-08-22 22:27:03 -07:00
Crazy Lemon	bf8520528c	Merge pull request #9257 from variableundefined/WelderCableOverheal ... Adds overheal to welder & cable coil	2018-08-22 22:15:38 -07:00
variableundefined	80123d90ad	Stop implantcase from disappearing	2018-08-22 22:36:02 +08:00
variableundefined	c21dc7929a	Wallet icon defaults to green if it is filled with an id of any type	2018-08-16 22:22:51 +08:00
variableundefined	845401725e	Defib paddles snap away if you walk away from the defib	2018-08-16 21:49:39 +08:00
TDSSS	12a2660619	added hyposprays to medbelt	2018-08-16 14:32:37 +02:00
Kyep	f40127b348	handles incoming emagged teleport to syndibeacon	2018-08-16 02:05:40 -07:00
Kyep	1e894f11ee	CrazyLemon RPD changes	2018-08-15 22:36:53 -07:00
FalseIncarnate	8c6685f1b0	Merge branch 'master' of https://github.com/ParadiseSS13/Paradise into kitchen	2018-08-16 00:16:32 -04:00
Kyep	7cebfc20c4	fixes for RPD and RCS exploits	2018-08-15 01:48:34 -07:00