Commit Graph

21844 Commits

Author SHA1 Message Date
Novacat 352fe555f2 Update structures.dm 2019-03-28 16:33:29 -04:00
Neerti ca044dcc2b Stairs go up 2019-02-01 21:40:21 -05: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
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 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 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
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 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
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 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 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 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
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
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
Mewchild 7477c696dc Updates Fluff Item 2018-12-14 13:21:49 -06:00
Spades 1c92c06771 Merge pull request #4584 from Novacat/nova-heterochromia
Replaces Ace's ammo with HP
2018-12-14 11:29:42 -05:00
Spades dd0a71d6b4 Merge pull request #4488 from Verkister/yeehow
Enables riding for a bunch of animals.
2018-12-14 11:28:32 -05:00
Unknown 7a22b9767c Adds Ascian's Shelter Capsule
- Adds Silver-trimmed shelter capsule, a luxury capsule that has a redecorated interior and some extra food, drink, and emergency supplies.
- Fixes issue where Shelter capsule pod beds started with no padding
2018-12-13 21:28:24 -05:00
Verkister 447e0a8340 Fixes undefined z-levels shitting caves all over the place
-Basically just gives the tether lateload z-levels actual z-levels and assigns them for use.
-Also moves the cave/ore generation for beach cave and V2 caves for the actual map loader instead of some awaymap temp objects that had apparently didn't have enough concept for proper z definitions.
-Fixes the forementioned things constantly bugging out and spawning all those caves and ores into the surface level foundations.

-Also fixes PoIs getting squished at least until Polaris gets their shit together with yet another submap rotation refactor.

God let me get some fucking rest fsghjasf
2018-12-14 01:15:28 +02:00
Verkister 4a2d895ced Code part for colorable alraune 2018-12-13 13:37:24 +02:00
Unknown b48efb138f More merge conflict fixes
I think I got them all.
2018-12-13 00:33:32 -05:00
Unknown 64fd3a11a6 Replaces Ace's ammo with HP
Since 9mm has hollow point now.
2018-12-12 21:53:24 -05:00
Spades 8ff334d67c Merge pull request #4526 from VOREStation/upstream-merge-5736
[MIRROR] Fixes missing hollow point ammo for 9mm
2018-12-12 21:25:22 -05:00
Spades 670e5e3765 Merge pull request #4523 from VOREStation/upstream-merge-5718
[MIRROR] New hair + underwear
2018-12-12 21:24:49 -05:00
Spades 37932732ca Merge pull request #4575 from Screemonster/stopfuckingwiththepomdamnit
makes the pompom uncontaminatable
2018-12-12 21:24:11 -05:00
Spades 531bd6a7eb Merge pull request #4562 from Verkister/patch-27
Disables PDA contamination.
2018-12-12 21:22:15 -05:00
Spades 8c3c8c45c9 Merge pull request #4549 from Verkister/implantshuds
Fixes some implant related issues.
2018-12-12 21:19:41 -05:00
Spades d46b03c2ca Merge pull request #4542 from Verkister/yeehowlayer
Fixes some layering issues on taur/borg riding.
2018-12-12 21:18:52 -05:00
Spades 1111241d7d Merge pull request #4533 from Verkister/patch-26
Fixes digestive analyzer missing sync button
2018-12-12 21:14:53 -05:00
Screemonster 10138a49d3 makes the pompom uncontaminatable 2018-12-10 02:49:38 +00:00
Spades 5fe51f64ad Merge pull request #4507 from Verkister/patch-25
Fixes ingested organs giving way too much fat
2018-12-08 21:14:38 -05:00
Spades 9b92dc1836 Merge pull request #4462 from Novacat/nova-basicfixes
Expedition Job and Gear tweaks
2018-12-08 09:44:15 -05:00
Spades fe30b9a61d Merge pull request #4409 from Novacat/nova-pathfinder
Shelter Capsule Content Tweaks
2018-12-08 09:42:18 -05:00
Zap-zapper 3b2258ce38 size control implant 2018-12-08 17:12:33 +07:00
Verkister db0cfe8829 Disables PDA contamination.
No more messaging list meta.
2018-12-07 17:31:59 +02:00