Commit Graph

24642 Commits

Author SHA1 Message Date
Sharkmare a9b863da1d Update synx.dm 2020-01-11 02:00:48 +01:00
Sharkmare 50f1c3845f Update synx.dm 2020-01-11 01:53:41 +01:00
Sharkmare 9cd7df6f6a 🥚 2020-01-11 01:50:59 +01:00
Sharkmare e4f544eb32 Trying to fix FLUFF 2020-01-11 01:20:11 +01:00
Sharkmare f568be89d9 The cake, Serg event. (#120)
Adds items for an event, Made by Shadowfire117 and Ketrai
2020-01-11 00:20:57 +01:00
Matica 537aeb72c2 Forgot One of The Drinks 2020-01-10 17:16:51 -05:00
Matica 9a52274152 Adds in CS Edit For Edits Made 2020-01-10 17:14:51 -05:00
Heroman ed3e4230a2 Temporarily removes update_client_z from /logout 2020-01-11 08:04:41 +10:00
Sharkmare de0e6abf07 Merge pull request #114 from TheFurryFeline/TFF-Restore_Whitelisting_Fixy
Restore whitelist requirements for Diona and Xenochimera species.
2020-01-10 22:15:01 +01:00
Sharkmare 4fad64f620 Adding CHOMP synth_facemask (#115)
* Re Adding CHOMP synth_facemask
2020-01-10 21:56:32 +01:00
Sharkmare 6f94d6e05e Removes YW/VS Fluff (#110)
* Removes YW/VS Fluff
2020-01-10 21:43:43 +01:00
TheFurryFeline 647c5f2883 Restore Whitelisting Fixy
Changelog Notes:

- Restore whitelist requirements for Diona and Xenochimera species.
2020-01-10 11:32:10 -05:00
Razgriz e6636d3c6d Hardcoded firedoors for elevators 2020-01-10 01:39:45 -07:00
Atermonera d5775d03be Merge pull request #6610 from Schnayy/glitterfly_borg
Adds Pyralis borg sprite
2020-01-10 01:11:20 -05:00
Matica a96df58059 Liquids with Nutriment Values
Gives nutrient values to sodas, (most) drinks that have soda in their recipe, as well as gives high nutrient values to drinks that use honey, peanut butter, or corn oil.
2020-01-09 23:12:26 -05:00
Novacat 022c7edaae Merge pull request #6405 from Mithrandalf/mouse3
more mouse stuff, bugfix
2020-01-09 22:51:47 -05:00
Novacat 4f6a7972d6 Merge pull request #6404 from Ketrai/iwantdie
adds food cubes.
2020-01-09 22:51:32 -05:00
Novacat 744758091b Merge pull request #6388 from Holdelta/BorgPetting
Adding borg petting
2020-01-09 22:51:19 -05:00
Novacat 658c0560c8 Merge pull request #6380 from Heroman3003/vore_laws
Adds some vorish silicon lawsets
2020-01-09 22:50:58 -05:00
Novacat afb879ae23 Merge pull request #6379 from Heroman3003/resleeving_sickness
Adds resleeving sickness
2020-01-09 22:50:42 -05:00
Novacat 9b2ff8f8f7 Merge pull request #6312 from TheFurryFeline/TFF-No_Absorbee,_No_Absorbee,_Noooo_Absorbee
Absorption Permission Stuff
2020-01-09 22:50:18 -05:00
Heroman3003 5f05d26eb9 Merge branch 'master' into resleeving_sickness 2020-01-10 09:43:42 +10:00
Heroman a9c1f48a93 Adds a single cure pill to vault, doubles amount ERT gets, changes taste 2020-01-10 09:31:51 +10:00
Sharkmare 76e7accd10 Synx V1,5
Functional again, still using some of the old AI code i previously wrote.
Missing:
Forcefeeding and Poison.
2020-01-09 11:33:14 +01:00
Razgriz 9f5d08e96a Merge pull request #104 from MrMacint0sh/master
Commenting is Key when it comes to Fat Taurs. Also a Bugfix.
2020-01-08 23:31:44 -07:00
TheFurryFeline 1da9b43963 Re-revert's Removal of Headsits.
Title.

Changelog Notes:

- Reverts removal of https://github.com/VOREStation/VOREStation/pull/5581 by YW. Comments adjusted accordingly.
2020-01-08 21:32:14 -05:00
Heroman 0c5ddf8cbb Stat adjustments 2020-01-09 09:07:11 +10:00
Heroman c693bf558d Does virgo-side of xenoflora expansion 2020-01-09 08:30:42 +10:00
Novacat 09e10e2901 Merge pull request #6406 from VOREStation/upstream-merge-6592
[MIRROR] Xenoflora expansion take2
2020-01-08 17:18:49 -05:00
Novacat 827a798d76 Merge pull request #6409 from VOREStation/upstream-merge-6596
[MIRROR] Informs ghosts when someone dies
2020-01-08 17:10:16 -05:00
Mack 3babf30a7b Adding CHOMP Comments for easier locating. 2020-01-08 15:41:38 -05:00
Mack 66a8108bf4 Updated comments 2020-01-08 15:36:27 -05:00
Atermonera cb99a0dd4a Merge pull request #6596 from GeneriedJenelle/patch-2
Informs ghosts when someone dies
2020-01-08 13:49:06 -05:00
Ketrai 85667c2a9b adds gnomes. (#6595)
* adds gnomes

* Makes the house nice and bright.

* copypasta error

* Odd

* makes gnomes adminspawn only.

Co-authored-by: KitKetKetrai <49008286+KitKetKetrai@users.noreply.github.com>
2020-01-08 13:47:41 -05:00
Mechoid ec5e851399 Xenoflora expansion take2 2020-01-08 13:46:25 -05:00
Ketrai 28eb142141 Adds a recipe for food cubes 2020-01-08 19:45:49 +01:00
Mithrandalf 79557cba8f flicked the 1 to a 0 for machine_understands 2020-01-08 17:02:15 +00:00
Mack 88aa4b7c04 Deleting dm.orig file, unneeded, as per TheFurryFeline's Request 2020-01-08 11:29:23 -05:00
Mack 8996a7dda8 Fixing Fat Wolf Taur
Fixed up some code discrepancies that stopped a person with the single color fat taur body from using the Duty Taur Vest.
2020-01-08 11:28:40 -05:00
Mithrandalf 1e8a54b736 mouse 2020-01-08 15:32:07 +00:00
Razgriz 08d3cda868 Merge pull request #81 from Shadow-Quill/patch-1
Removes ball-kicking
2020-01-08 03:32:21 -07:00
Razgriz 298c8b72fa Merge pull request #100 from CHOMPStation2/Sharkmare-UNI-FAB
Re porting unified fabricators
2020-01-08 02:04:28 -07:00
Repede 8bba624fe3 Merge branch 'master' into self 2020-01-07 23:54:34 -05:00
Repede c343889525 Makes Teshari small boyes again, can thus be picked up by any and all crew. 2020-01-07 23:53:18 -05:00
Ketrai c8531c827f Fixed conflicts. Adds water bottle to the machine coz logic. 2020-01-07 23:07:50 +01:00
Ketrai 9112a9a2b6 Food cubes
woop


removes a line of unneeded code
2020-01-07 22:51:12 +01:00
Sharkmare 0c109fcc8c Re porting unified fabricators
This time you can set what drones they are allowed to make on the mapping side, so 1 item can be set to produce whatever drone you want mapped, meaning you can still have a unify fab that can only print mining drones. Just gotta map the tag appropriately
2020-01-07 20:48:58 +01:00
Heroman b8d301649c Removes forgotten closing tags 2020-01-07 18:30:30 +10:00
Heroman 2b10027024 Makes the sickness affect only people dying via non-vore deaths, adds fluff version with no downsides 2020-01-07 17:02:39 +10:00
TheFurryFeline 2806ddc4a4 Bloodsucker Plus Fixy
Fixes a copy-pasta oversight. Also adds CS Removal comments for traits commented out here.
2020-01-06 14:55:08 -05:00