Commit Graph

10409 Commits

Author SHA1 Message Date
Novacat
2914cbf2ce Merge pull request #6497 from VOREStation/upstream-merge-6648
[MIRROR] Fix Water Resistance.
2020-01-23 17:40:31 -05:00
Novacat
37f2862660 Update species.dm 2020-01-23 17:14:31 -05:00
Atermonera
b2cafb7e14 Fix Water Resistance. 2020-01-23 17:13:51 -05:00
Heroman
824637d6a4 _vr 2020-01-24 08:13:45 +10:00
Heroman
d8c43701ff Removes prommies weakness to water entirely 2020-01-24 08:11:02 +10:00
Heroman
2ca6c5870a Earlyports fix for water killing everything 2020-01-24 07:59:24 +10:00
Novacat
d7e919c66f Merge pull request #6482 from VOREStation/upstream-merge-6636
[MIRROR] Fix various syntactic problems
2020-01-21 01:23:04 -05:00
Atermonera
5bcb9cc934 Fix various syntactic problems 2020-01-21 01:06:04 -05:00
Atermonera
5954adfe46 Merge pull request #6622 from Mechoid/WaterResistanceExists
Water resistance exists
2020-01-20 22:51:52 -05:00
Heroman
27127a11e0 Fixes bots being able to do vore 2020-01-20 11:08:04 +10:00
Heroman
89c873db06 Removes some redundant vorestation edits 2020-01-15 18:30:43 +10:00
Novacat
9a6271b42a Merge pull request #6442 from Heroman3003/grubfix
Fixes grub event end announcement not functioning
2020-01-13 16:55:55 -05:00
Heroman
ede140ec9c Fixes grub event end announcement not functioning 2020-01-14 05:58:38 +10:00
Novacat
d7962d0448 Merge pull request #6441 from Heroman3003/droppodfix
Fixes droppod spawning wrong subtype
2020-01-13 09:10:04 -05:00
Heroman3003
9e31d82dd5 Decreases chance 2020-01-13 18:16:46 +10:00
Heroman
f032c80486 Also buffs vore laws chance for lost voreborgs 2020-01-13 17:55:00 +10:00
Heroman
4551f97924 Makes drone age restriction based on config setting too 2020-01-13 14:56:27 +10:00
Novacat
0a58fb115c Merge pull request #6433 from Heroman3003/dronelimit
Adds a timegate on playing maintenance drones
2020-01-12 17:03:43 -05:00
Heroman
de03c4e3e3 Adds a timegate on playing maintenance drones 2020-01-13 06:19:10 +10:00
Verkister
8cc8f73ccc Fixes mob riding double input exploit
The rider's movement input is now ignored if the mount has moved within the last second.
2020-01-12 02:09:56 +02:00
Verkister
bcced2f53b Fixes sleeperbellies not supplying air to occupant
Fixes sleeperbellies forcing the occupant to breathe external atmosphere and killing the occupant in hostile external environments.
2020-01-11 17:13:10 +02:00
Novacat
e1f3b56f74 Revert "Temporarily removes update_client_z from /logout" 2020-01-11 01:08:14 -05:00
Heroman
ed3e4230a2 Temporarily removes update_client_z from /logout 2020-01-11 08:04:41 +10:00
Atermonera
d5775d03be Merge pull request #6610 from Schnayy/glitterfly_borg
Adds Pyralis borg sprite
2020-01-10 01:11:20 -05:00
Novacat
022c7edaae Merge pull request #6405 from Mithrandalf/mouse3
more mouse stuff, bugfix
2020-01-09 22:51:47 -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
Atermonera
cb99a0dd4a Merge pull request #6596 from GeneriedJenelle/patch-2
Informs ghosts when someone dies
2020-01-08 13:49:06 -05:00
Mithrandalf
79557cba8f flicked the 1 to a 0 for machine_understands 2020-01-08 17:02:15 +00:00
Mithrandalf
1e8a54b736 mouse 2020-01-08 15:32:07 +00:00
Novacat
6f24070dbd Merge pull request #6400 from VOREStation/upstream-merge-6597
[MIRROR] Adjusts Emphasize Name Mention
2020-01-05 20:20:22 -05:00
Andrew
07192b935c Adjusts Emphasize Name Mention (#6597)
Capitalizes all the words in the not_included section so that they actually get removed from the name check system.

Names can't be lowercase so there is no point in keeping the previous version.
2020-01-05 18:10:42 -05:00
Heroman
e05fdf6258 Fixes clamp issues 2020-01-06 08:37:27 +10:00
Mechoid
c3079004ea GameMaster Tuning (#6593)
* Actually Game Master but I am an idiot.
2020-01-05 01:39:28 -05:00
Heroman
489197990c Removes Poly's roundstart headset 2020-01-03 12:57:54 +10:00
Novacat
76f323984c Merge pull request #6373 from Verkister/ridewild
Adds a verb for rideable mobs to toggle rider control without a riding crop
2020-01-01 12:03:42 -05:00
Holdelta
53716a38b3 Update robot.dm 2019-12-31 22:32:56 -08:00
Holdelta
f8196681c7 Update robot.dm 2019-12-31 19:27:41 -08:00
Holdelta
ebd4a75584 Update robot.dm 2019-12-31 19:17:20 -08:00
Novacat
524ef9ee17 Merge pull request #6349 from Novacat/nova-basicfixes
Misc Changes and bugfixes
2019-12-31 18:39:10 -05:00
Novacat
a7551aea22 Merge pull request #6384 from Heroman3003/feral-bois
Implements ferality indicator for xenochimera
2019-12-31 11:43:51 -05:00
Novacat
468e676779 Merge pull request #6325 from TheFurryFeline/TFF-Nose_Boopage!
Boop Da Noses!
2019-12-31 10:22:39 -05:00
Heroman
e21ac7d522 _vr 2019-12-31 15:42:15 +10:00
TheFurryFeline
50adcea491 Blep
Big chunka text surrounded by Vorestation edit
2019-12-30 16:41:02 -05:00
TheFurryFeline
8a63f28c78 Comment Consistency 2019-12-30 10:50:32 -05:00
Heroman
8f6878e6db Implements ferality indicator for xenochimera 2019-12-30 10:22:57 +10:00
Novacat
f2fb0d9f6a Merge pull request #6360 from Ketrai/sharksbranch
Adds a new fish, measelsharks!
2019-12-29 15:11:46 -05:00
Unknown
7aeb10d1e8 Nerfs ADG health too 2019-12-29 11:03:35 -05:00
Unknown
6faf4fdea3 Nerfs Gygax tesla zap 2019-12-29 10:52:08 -05:00
Verkister
f5e02b9b23 Fixes chairs acting as handcuffs. (#6588)
* Fixes chairs/beds/etc acting as handcuffs.

It's been at least 7 years without anyone noticing a broken feature with a false comment so the unintentional "balancing" caused by this may have ingrained a standard some folks would rather keep in, but that kind of nerfs have proper ways of implementing at their own appropriate places in the code.

Basically this just lets folks use hands when buckled. May also have a side effect of allowing self-surgery if it never had a proper prevention method implemented. Keeps an exception for xeno nests tho. Any other seat has no reason to be handcuffs.

* Fixes another thing causing chairs to incapacitate

"Are you seated" and "Are you incapacitated" should not be used as the same thing yet here we are.

I should probably also do a refactor to remove all the inappropriate use of canmove var. Seriously, even the specifically cartridge exclusive PDA menu buttons are using that for what???
2019-12-29 02:42:50 -05:00