Commit Graph

35767 Commits

Author SHA1 Message Date
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
lbnesquik
f2245e7d7d Merge branch 'master' of https://github.com/VOREStation/VOREStation 2020-01-03 22:48:39 +01:00
lbnesquik
e772c1a09b Add ambrosia seed as a somewhat rare loot for trash.
Why is this good:
- Low level illegal stuff to do
- I can make my pothead characters
- This is like the most common illegal drug ever, so having it being harder to get than size guns or basically anything in R&D is weird.
- What are you going to do with weed besides smoke it anyway?
2020-01-03 22:47:32 +01: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
Atermonera
0924159554 Merge pull request #6589 from Heroman3003/fruist-multispawn
Allows admin spawning fruit in multiples
2019-12-31 19:14:32 -05:00
Novacat
524ef9ee17 Merge pull request #6349 from Novacat/nova-basicfixes
Misc Changes and bugfixes
2019-12-31 18:39:10 -05:00
Unknown
750c6f0ea7 Remove medicine bottle from TE Whitelist 2019-12-31 18:09:13 -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
df5b81c1b9 Merge pull request #6367 from lbnesquik/Kates-Taur-Clothes_3
Introduce more taur clothes.
2019-12-31 10:23:42 -05:00
Novacat
468e676779 Merge pull request #6325 from TheFurryFeline/TFF-Nose_Boopage!
Boop Da Noses!
2019-12-31 10:22:39 -05:00
Novacat
3ef9dd9b28 Merge pull request #6362 from Ketrai/superqualityforbartenders
makes glasses mass producable
2019-12-31 10:22:24 -05:00
Heroman
e21ac7d522 _vr 2019-12-31 15:42:15 +10:00
Heroman
9246b2ac51 Adds onclick check for the danger/feralness indicator 2019-12-31 08:46:36 +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
lbnesquik
377723bcf4 Merge branch 'master' of https://github.com/VOREStation/VOREStation into Kates-Taur-Clothes 2019-12-30 09:09:51 +01: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
64b4d435f9 Joan's spacesuit no longer NORMAL size 2019-12-29 11:26:37 -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
Novacat
0ba0682c08 Merge pull request #6382 from VOREStation/upstream-merge-6587
[MIRROR] Allows to set department names on fax machines
2019-12-29 09:07:00 -05:00
Heroman3003
f1c23c4f5a Allows to set department names on fax machines (#6587) 2019-12-29 02:44:04 -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
Heroman
572112d28b Fixes AI not being able to resist out of nets 2019-12-29 08:33:10 +10:00
Verkister
9093b84d24 Adds a verb for rideable mobs to toggle rider control without a riding crop.
-Mountable mobs/borgs/taurs can now let the rider in control without requiring a riding crop.
-And yes, riding crop has always been "the key" for rider control for these mechanics.
-Also tweaks the AO a little bit more because ouch my ocd.
2019-12-26 17:57:26 +02:00
lbnesquik
562df07602 Move the lance sprite to weapons_vr.dmi. 2019-12-26 07:25:49 +01:00
lbnesquik
eace084579 Merge branch 'master' of https://github.com/VOREStation/VOREStation into Kates-Taur-Clothes 2019-12-26 07:25:05 +01:00
Novacat
7599ad7041 Merge pull request #6369 from VOREStation/upstream-merge-6584
[MIRROR] Printable Spray Bottles
2019-12-25 20:13:56 -05:00
Atermonera
45b4947d1e Merge pull request #6584 from TheFurryFeline/TFF-Print_Da_Sprayers
Printable Spray Bottles
2019-12-25 18:10:16 -05:00
Atermonera
d6b16dd09e Merge pull request #6585 from Verkister/patch-31
Fixes gentle hairstyle missing
2019-12-25 18:10:05 -05:00
lbnesquik
ae398259ea Introduce more taur clothes.
- Add medieval style barding for centaurs.
- Add full body options for wolf taurs. (Fat sprites slightly break this)
- Cloak for Drakes
- Botany Apron should work for the majority of taurs and not weirdly cut at the middle.
- WIP lance
2019-12-25 20:40:21 +01:00
Unknown
dced9171d9 mow 2019-12-25 14:00:18 -05:00
Unknown
63f2fc0f20 Repurposing FTW 2019-12-25 13:54:31 -05:00
Novacat
860566a1b6 Merge pull request #6350 from Verkister/tallboys
Fixes resizing for icons taller than 32p
2019-12-24 12:01:30 -05:00
Novacat
01b57eb28f Merge pull request #6344 from VOREStation/upstream-merge-6572
[MIRROR] Buffs radiation so it isn't defeated by a thin sheet of lead.
2019-12-24 11:59:27 -05:00
Ketrai
15c1c45b34 Makes it so you can use sharkmeat for fish-dishes 2019-12-23 17:57:13 +01:00
Cerebulon
183b1d99b1 Coffee Shop Revamp 2019-12-22 22:54:01 -05:00
Ketrai
e6021d108d makes glasses mass producable 2019-12-22 21:15:29 +01:00
Unknown
235308da6e Merge remote-tracking branch 'VOREStation/master' into nova-basicfixes 2019-12-22 13:40:04 -05:00
Unknown
2d81426a5a Juice no longer affects Unathi 2019-12-22 13:21:20 -05:00
Ketrai
0e65a0b8a6 Adds sharks 2019-12-22 17:32:49 +01:00
Novacat
acc510a92e Merge pull request #6354 from VOREStation/upstream-merge-6480
[MIRROR] Fixes mech projectile armor thinking test projectiles are dangerous
2019-12-22 11:01:23 -05:00
Unknown
6f3e4e72e1 Purges simpleanimal files 2019-12-22 10:58:13 -05:00
Unknown
26a1bca72d Compatibility Fixes One 2019-12-22 10:52:45 -05:00