21722 Commits

Author	SHA1	Message	Date
Anewbe	fa9c8abea0	Merge pull request #5730 from Nalarac/patch-2 ... Adds Autolathe Cost to Knuckledusters	2018-11-09 22:05:35 -05:00
Wickedtemp	858dbd6ddf	Allows for Whitelst ... As per the SCA for Tempest being approved, and so Zal doesn't have to manually add it to their character every time they log in.	2018-11-06 22:05:12 -06:00
Aronai Sieyes	3b5b03e05b	Merge pull request #4471 from VOREStation/upstream-merge-5701 ... [MIRROR] Update silicon manifest to discord dark theme.	2018-11-05 15:25:41 -05:00
Arokha Sieyes	d50e2d9deb	Edit mapped in HoS armor ... It was edited on the map to have pretty incredible armor values, better than SWAT armor, even. Things like this shouldn't be edited in the dmm files. Hard to have oversight on things like that. Moved the armor values to the code and out of the map, and adjusted them to be more reasonable after discussing with other admins.	2018-11-04 22:51:32 -05:00
Aronai Sieyes	096400b312	Merge pull request #4470 from VOREStation/upstream-merge-5698 ... [MIRROR] Prometheans can process blood without exploding.	2018-11-01 00:22:04 -04:00
Aronai Sieyes	425616a91b	Fix vs edit conflict	2018-11-01 00:01:27 -04:00
Aronai Sieyes	2b5e073137	Merge pull request #4468 from VOREStation/upstream-merge-5705 ... [MIRROR] Fix adminhelp sound toggle respect	2018-10-31 23:58:54 -04:00
Aronai Sieyes	8ac7ad274f	Merge pull request #4467 from VOREStation/upstream-merge-5691 ... [MIRROR] Remplace the plant clippers with a pair hedgetrimmers	2018-10-31 23:58:23 -04:00
Aronai Sieyes	6578b68adb	Merge pull request #4466 from VOREStation/upstream-merge-5665 ... [MIRROR] Port some noises from baystation.	2018-10-31 23:57:57 -04:00
Aronai Sieyes	48308e6393	Merge pull request #4457 from Keekenox/informativename ... add medium angel wing sprites	2018-10-31 23:47:52 -04:00
Neerti	bcf58840d0	Merge pull request #5701 from lbnesquik/Kates-Ai-Manifest-Fix ... Update silicon manifest to discord dark theme.	2018-10-30 18:42:47 -04:00
Neerti	feabaafa6e	Prometheans can process blood without exploding.	2018-10-30 18:41:34 -04:00
Neerti	8333f3cd0b	Merge pull request #5705 from VOREStation/aro-bwoink ... Fix adminhelp sound toggle respect	2018-10-30 18:38:59 -04:00
Neerti	68d1d5cce9	Merge pull request #5691 from lbnesquik/Kates-Hedgetrimmers-feature ... Remplace the plant clippers with a pair hedgetrimmers	2018-10-30 18:37:45 -04:00
Neerti	aa13df67fe	Merge pull request #5665 from lbnesquik/Kates-Machinery-Port ... Port some noises from baystation.	2018-10-30 18:36:30 -04:00
Keekenox	1c25ffe12a	Switched off unit test 11 because the build had to go out now and there was no time to fix it properly. ... Wingy bois	2018-10-27 16:07:06 -04:00
Aronai Sieyes	816a5c9a57	Fix mistyped macro and indent	2018-10-25 17:35:42 -04:00
Andrei Jors	9fb6894a07	Brings this over from Citadel. Ignore the CITADEL CHANGE comments.	2018-10-25 17:16:05 -04:00
Atermonera	cab7997b27	Merge pull request #5686 from lbnesquik/Kates-Waistcoast ... Fixes all waistcoast being black when worn in the suit slot	2018-10-23 15:00:56 -04:00
Aronai Sieyes	6fa54a605f	Merge pull request #4438 from Heroman3003/intelligence-levels-2 ... Added intelligence levels to some virgo mobs	2018-10-23 14:03:21 -04:00
Aronai Sieyes	613c789b2e	Merge pull request #4434 from Novacat/nova-heterochromia ... Nerfs Cash from Mining Vendor	2018-10-23 13:12:36 -04:00
Aronai Sieyes	aca8fa397e	Merge pull request #4450 from VOREStation/upstream-merge-5692 ... [MIRROR] Correctly fix surgery caps selection this time.	2018-10-23 12:33:29 -04:00
Aronai Sieyes	db37cc6c92	Merge pull request #4449 from VOREStation/upstream-merge-5693 ... [MIRROR] Fixes duplication of corpses by holding and then cooking	2018-10-23 12:33:14 -04:00
Aronai Sieyes	e6441d56a4	Merge pull request #4442 from VOREStation/upstream-merge-5694 ... [MIRROR] Fix for duplicated loadout descriptions	2018-10-23 12:33:04 -04:00
Atermonera	b2e676d216	Merge pull request #5692 from lbnesquik/Kates-Surgery-Fix ... Correctly fix surgery caps selection this time.	2018-10-22 20:55:18 -04:00
Shophaune	fad2beb82e	Fixes duplication of corpses by holding and then cooking (#5693) ... * Add files via upload * Revert "Merge pull request #1 from Shophaune/plant-bag-ui-bug-fix" This reverts commit 62a60d4f87774508621506b347c679191e1a242f, reversing changes made to 6f909ce590. * Fix for cooking mob duplication * Actually this is a better method, thanks Baystation Yeah they kinda fixed it three days ago way better than I did it so	2018-10-22 20:54:02 -04:00
Shophaune	7266f28757	Fix for duplicated loadout descriptions (#5694) ... * Add files via upload * Revert "Merge pull request #1 from Shophaune/plant-bag-ui-bug-fix" This reverts commit 62a60d4f87774508621506b347c679191e1a242f, reversing changes made to 6f909ce590. * Borrowing Ibnesquik's descriptions to fix this issue quickly.	2018-10-21 14:23:59 -04:00
Heroman3003	dde664c1fb	Added intelligence levels to some virgo mobs	2018-10-21 07:49:49 +10:00
Aronai Sieyes	7c522fc0c4	Revert "Stethoscope vore shitpost"	2018-10-20 17:43:06 -04:00
Spades	50825403df	Merge pull request #4317 from lbnesquik/Kates-stethoscope-Feature ... Stethoscope vore shitpost	2018-10-20 17:39:55 -04:00
Aronai Sieyes	d6cdba16c8	Merge pull request #4432 from VOREStation/upstream-merge-5685 ... [MIRROR] Fix for Viewing Newly Made Records	2018-10-20 17:37:34 -04:00
Aronai Sieyes	2d6d05acb0	Merge pull request #4429 from VOREStation/upstream-merge-5663 ... [MIRROR] More paths to Quick_Create	2018-10-20 17:37:20 -04:00
Spades	b28213c906	Merge pull request #4356 from Novacat/nova-ert ... ERT Equipment Redo	2018-10-20 17:34:41 -04:00
Aronai Sieyes	382c6b5152	VS edit merge	2018-10-20 17:28:24 -04:00
Unknown	c674f13de4	Nerfs Cash from Mining Vendor ... The current output of cash from the mining vendor is a bit too high considering that it is not hard for miners to pull 20K-40K points, and, probably will break the next trader ship event when it comes if a miner can just drop 15K-25K Thalers on the table.	2018-10-20 14:50:43 -04:00
Spades	dbec51db41	Merge pull request #4433 from Verkister/infixfix ... Fixes examine for mobs that relied on atom proc specific features.	2018-10-20 08:58:05 -04:00
Spades	79d5ece0b3	Merge pull request #4430 from VOREStation/upstream-merge-5690 ... [MIRROR] Fix wax appearing to be steel.	2018-10-20 08:57:38 -04:00
Spades	87210df046	Merge pull request #4428 from VOREStation/upstream-merge-5667 ... [MIRROR] Bring back the traitor panel verb.	2018-10-20 08:56:39 -04:00
Spades	c9a5499a70	Merge pull request #4426 from Heroman3003/awoo-refactor ... Replaces awoo with wolfgirl	2018-10-20 08:56:14 -04:00
Spades	6d3b8812f5	Merge pull request #4344 from Novacat/nova-heterochromia ... Reverts species settings	2018-10-20 08:52:05 -04:00
Verkister	81fa928d4c	Fixes examine for mobs that relied on atom proc features. ... -Mainly affected borgs and pAIs. Maybe others idk.	2018-10-20 14:47:39 +03:00
Neerti	e019d0c8ef	Fixes new record bug. (#5685)	2018-10-20 03:36:16 -04:00
Neerti	ea6a9f2df5	Merge pull request #5690 from lbnesquik/Kates-Wax-Fix ... Fix wax appearing to be steel.	2018-10-20 00:07:01 -04:00
Neerti	360103a487	More paths to Quick_Create	2018-10-20 00:05:48 -04:00
Neerti	e46506adf7	Merge pull request #5667 from lbnesquik/Kates-Admin-Tweak² ... Bring back the traitor panel verb.	2018-10-20 00:05:37 -04:00
Heroman3003	1ea42e4558	Refactors Awoos into Wolfgirls	2018-10-20 12:35:32 +10:00
Sebbe9123	df23ae9891	Adds toggle for secpatch ... You can now toggle and switch what eye the secpatch covers for all your partial blindness needs.	2018-10-18 11:27:04 +02:00
Spades	ea12d3d18c	Merge pull request #4328 from lbnesquik/Kates-Citborg-Port ... Dogborgs start with full water reserves.	2018-10-17 17:28:51 -04:00
Neerti	972777fd94	Adds Mods/Dev perms to ticket permission checks (#5683)	2018-10-16 18:28:14 -04:00
Neerti	62ac0986ca	Makes RCDs Clean Again	2018-10-16 14:17:44 -04:00