45207 Commits

This Branch

This Branch

All Branches

Author	SHA1	Message	Date
Anewbe	f169a5f8bf	fixes zaddat mask problem	2019-02-19 22:52:18 -05:00
Spades	57997f7185	Merge pull request #4774 from Verkister/patch-33 ... Fixes caves and POIs disregarding map padding	2019-02-18 19:42:40 -05:00
Verkister	082058e450	Fixes caves and POIs disregarding map padding ... No more caves/POIs leading into the potentially leaky void.	2019-02-17 14:27:30 +02:00
Spades	30ab44613d	Merge pull request #4540 from VOREStation/upstream-merge-5714 ... [MIRROR] Borg, Gripper, and Integrated Circuit interaction update.	2019-01-21 11:42:38 -05:00
Spades	a0cb0a347d	Merge pull request #4638 from Verkister/patch-32 ... Fixes movement draining nutrition below negatives	2019-01-06 10:41:15 -05:00
Verkister	890803e0c6	Fixes movement draining nutrition below negatives ... And these negative numbers were apparently breaking the weight loss and examination messages.	2019-01-06 15:46:20 +02:00
Spades	fc2f451bd4	Merge pull request #4586 from Verkister/boyidie ... Fixes undefined z-levels shitting caves all over the place	2019-01-05 17:02:33 -05:00
Spades	d43a352ff8	Update vorestation.dme	2019-01-05 08:24:43 -05:00
Spades	8ae3a5499f	Merge pull request #4621 from Heroman3003/tesla-changes ... Adjustments to the tesla submap	2019-01-05 08:22:57 -05:00
Spades	1b6f074890	Merge pull request #4622 from Novacat/nova-pathfinder ... Adds an Admin Subspace Jammer for events	2019-01-05 00:04:57 -05:00
Spades	81f7b979c2	Merge pull request #4628 from Heroman3003/shellguard-fix ... Fixes shellguard-noble sprites not actually having sprites	2019-01-05 00:04:40 -05:00
Spades	ac93866ddc	Merge pull request #4610 from Heroman3003/borg-making-fix ... Fixed creation of borgs through non-spawn method	2019-01-05 00:03:32 -05:00
Spades	2c288ee62b	Merge pull request #4624 from Verkister/patch-30 ... Fixes food not getting digested on itemweak.	2019-01-05 00:01:35 -05:00
Spades	35c54b4324	Merge pull request #4614 from Novacat/nova-heterochromia ... Virgo Language Fixes	2019-01-05 00:01:15 -05:00
Spades	a2c6a23e7e	Merge pull request #4606 from Mewchild/MC-Security ... Rearranges Security	2019-01-05 00:00:31 -05:00
Spades	8c1b8aacb2	Merge pull request #4550 from Zap-zapper/size-im ... Size control implant	2019-01-04 23:59:17 -05:00
Spades	68401ebe5e	Merge pull request #4594 from Novacat/nova-survival ... Ports synth overheating fixes	2019-01-04 23:58:14 -05:00
Spades	1f8b55fbd4	Merge pull request #4625 from Ketrai/master ... Nerfs cargo pizza	2019-01-04 23:57:50 -05:00
Spades	272fa10ebc	Merge pull request #4520 from Novacat/nova-weapons ... Fixes Shuttle Transitions	2019-01-04 23:54:52 -05:00
Heroman3003	cae9207bae	Fixes shellguard-noble sprites not actually having sprites	2019-01-03 06:45:22 +10:00
Ketrai	4c62b1abde	Fixes nutriment stacking ... Currently cooking the pizza caused the intended amount of nutriment to be too high. This fixes it.	2019-01-02 00:36:27 +01:00
Ketrai	257a7809d0	Update snacks_vr.dm	2019-01-01 17:39:20 +01:00
Ketrai	1841614d78	Update snacks_vr.dm	2019-01-01 17:05:42 +01:00
Ketrai	681f52123f	Update snacks_vr.dm	2019-01-01 16:40:00 +01:00
Ketrai	7f474c490d	Update hospitality_vr.dm	2019-01-01 16:24:03 +01:00
Ketrai	1c43cfd638	Update snacks_vr.dm	2019-01-01 16:22:29 +01:00
Ketrai	f93b25b1c9	Update recipes_microwave_vr.dm	2019-01-01 15:57:21 +01:00
Ketrai	e37cf040b4	Update snacks_vr.dm	2019-01-01 15:50:13 +01:00
Ketrai	cce8993339	Add files via upload	2019-01-01 14:51:54 +01:00
Verkister	d90593d689	Fixes food not getting digested on itemweak. ... Well it would have been digesting if the belly had enough damage to oneshot it with the slow code. The problem was just that the itemweak mode was only applying one single hit on the food before excluding it from the loop for some reason.	2019-01-01 13:58:46 +02:00
Unknown	05b876aa3a	Adds an Admin Subspace Jammer for events ... I plan on doing a stationary version down the road but that will require a lot more work.	2018-12-31 09:13:39 -05:00
Heroman3003	7af7e31cb2	Removed step_x	2018-12-31 18:24:06 +10:00
Heroman3003	81574d94bb	updates tesla submap	2018-12-31 17:18:09 +10:00
Unknown	1b948808a0	Virgo Language Fixes ... Fixes #4613 and Fixes #4217	2018-12-28 09:03:22 -05:00
Heroman3003	93dc10a89c	Fixed creation of borgs through non-spawn method	2018-12-23 11:18:55 +10:00
Spades	3ba4a9005a	Merge pull request #4567 from Novacat/nova-pathfinder ... Adds Ascian's Shelter Capsule	2018-12-22 09:41:02 -05:00
Spades	bd541db1fa	Merge pull request #4600 from Verkister/flippo ... Fixes hippo sprite flipped directions	2018-12-22 09:13:39 -05:00
Spades	00b3a05354	Merge pull request #4603 from Verkister/eww ... Adds blacklist for item ingestion (borg and trashcanfolk)	2018-12-22 09:13:27 -05:00
Spades	2ecbec75be	Merge pull request #4578 from Darkwolf6180/master ... Fixes Engineering Taur Hardsuits	2018-12-22 09:12:37 -05:00
Spades	770e5b088b	Merge pull request #4574 from Verkister/contauring ... Some taur contrast tweaks. (And dual color alraune)	2018-12-22 09:12:19 -05:00
Spades	73335f0037	Merge pull request #4588 from Mewchild/MC-fluff ... Updates Fluff Item	2018-12-22 09:12:00 -05:00
Spades	31c15ac3bc	Merge pull request #4495 from ArgobargSoup/ArgoCollar ... Collar tweaks	2018-12-22 09:10:28 -05:00
Spades	96a5548d0d	Merge pull request #4590 from Heroman3003/mimics-b-gone ... Removes the mimics from the station map levels	2018-12-22 09:09:43 -05:00
Mewchild	936d979aab	Rearranges Security	2018-12-21 23:57:08 -06:00
Verkister	4c5cc9881a	Adds blacklist for item ingestion (borg and trashcanfolk) ... -Certain items previously blacklisted for digestion can still be eaten. (pAI, posibrain, AIcard, handtele beacon) -Implemented for borg sleepers and trash eaters to prevent ABOOSE	2018-12-21 12:19:23 +02:00
Verkister	c67d18ecb2	Fixes hippo sprite flipped directions	2018-12-20 13:00:16 +02:00
Unknown	2739c2b837	Ports synth overheating fixes ... This PR ports a fix from Chompstation regarding synths overheating in bellies. Hopefully it works here.	2018-12-18 14:03:04 -05:00
Heroman3003	09e6fb63f8	Removed the mimics from the station map levels	2018-12-16 08:16:43 +10:00
Mewchild	7477c696dc	Updates Fluff Item	2018-12-14 13:21:49 -06:00
Spades	0e7b6d0dc3	Merge pull request #4583 from Heroman3003/fixed-air-alarms-outpost ... Fixes air alarms on research outpost not being connected to local scrubbers.	2018-12-14 11:33:20 -05:00