Commit Graph

35475 Commits

Author SHA1 Message Date
BlackMajor
f93d50d272 Actually lets just make a simple global emote cooldown 2019-11-17 19:41:05 +13:00
BlackMajor
4a3581b91a Why do I keep forgetting virgo does weird modular things despite not being a downstream 2019-11-14 12:02:18 +13:00
BlackMajor
62631b396b Yeet 2019-11-13 20:23:18 +13:00
Novacat
d3e1710674 Merge pull request #6182 from TheFurryFeline/TFF-Let_The_Plushies_Live!-Virgo_Edition
Mouse Plushie Sprite Change
2019-11-12 12:27:37 -05:00
TheFurryFeline
aaa40000d0 Mouse Plushie Sprite Change
Title, changes a custom item's sprite to look more alive... Sorta.... Just doesn't make it look like it's a hecking dead mouse. Ported from https://github.com/CHOMPstation/CHOMPstation/pull/824
2019-11-12 10:34:24 -05:00
Meghan-Rossi
f8c214ea67 Fix box of service keys being called "box of command keys" 2019-11-12 08:55:43 +00:00
Novacat
6269866d8f Merge pull request #6178 from VOREStation/upstream-merge-6521
[MIRROR] Stop protein's affect_ingest calling nutriment's affect_ingest twice
2019-11-10 22:25:11 -05:00
Novacat
dcd5900f83 Update Chemistry-Reagents-Food-Drinks.dm 2019-11-10 22:04:40 -05:00
Anewbe
c9abdaabe9 Stop protein's affect_ingest calling nutriment's affect_ingest twice 2019-11-10 21:49:51 -05:00
Atermonera
20ee2c0ed2 Merge pull request #6519 from Mechoid/BotanyBugs
Fix Fruit Runtime
2019-11-10 18:52:11 -05:00
Novacat
929ff8077c Merge pull request #6171 from EllyBrown/master
Elly Brown (bacon12366) fluff item.
2019-11-08 16:35:08 -05:00
EllyBrown
96e1934a90 Add files via upload 2019-11-08 21:37:33 +02:00
Novacat
af52f4e7c3 Merge pull request #6094 from Novacat/nova-pathfinder
Rarer events, more event variety
2019-11-08 13:32:45 -05:00
Novacat
5e5e972e0b Merge pull request #6165 from Meghan-Rossi/fluffstuff
Fluff items
2019-11-08 13:29:34 -05:00
Novacat
357f30cf88 Merge pull request #6162 from VOREStation/upstream-merge-6514
[MIRROR] Setup for New Library
2019-11-08 13:16:40 -05:00
EllyBrown
7d3ff451fb Add files via upload 2019-11-08 19:36:36 +02:00
Unknown
a5c86a507d More compatibility updates 2019-11-08 10:50:42 -05:00
Unknown
7931795ddd Compatability, Re-enables old library 2019-11-08 10:47:32 -05:00
Novacat
80874ede4b Merge pull request #6155 from Very-Soft/no-bepis
Changes the cola machine sprite to something more generic and flashy
2019-11-07 02:12:28 -05:00
Novacat
dbe5a63061 Merge pull request #6166 from VOREStation/upstream-merge-6503
[MIRROR] Update Chat System to use to_chat(src, "") instead of src << ""
2019-11-05 20:04:55 -05:00
Novacat
078b965682 Update say.dm 2019-11-05 19:34:56 -05:00
Novacat
b8eac49b8d Update pai.dm 2019-11-05 19:34:12 -05:00
Atermonera
0c3ef8137f Merge pull request #6512 from Verkister/patch-29
Sanity check for orphaned ai_holder runtimes
2019-11-05 19:25:58 -05:00
Atermonera
a45472b446 Update Chat System to use to_chat(src, "") instead of src << "" 2019-11-05 19:22:38 -05:00
Meghan-Rossi
6bee95ef01 Fluff items
Removes Tasald's coat and loyalty implanter as requested in #6147
Adds Tasald's Cartographer's Uniform as approved in https://forum.vore-station.net/viewtopic.php?f=27&t=1627
adds medals:
Xander Bevin - Conduct - https://forum.vore-station.net/viewtopic.php?f=27&t=1579
Nick Sloan - Conduct - https://forum.vore-station.net/viewtopic.php?f=27&t=1575
Erik Ramadwood - Unity - https://forum.vore-station.net/viewtopic.php?f=27&t=1624
Nolan Conaway - Unity - https://forum.vore-station.net/viewtopic.php?f=27&t=1622

Resolves #6147
2019-11-05 11:28:37 +00:00
Novacat
d3b07d3fb7 Merge pull request #6164 from VOREStation/upstream-merge-6501
[MIRROR] Sharpening kits.
2019-11-04 22:49:12 -05:00
lolman360
31995aba35 Sharpening kits. (#6501)
* one

* rtwo

* image

* Update material_weapons.dm
2019-11-04 21:44:30 -05:00
Mechoid
e1fa847bc2 Xenowork Prep For Future (#6491)
* Xenowork, weeds walls and material blobs.

* More weeds

* XenoUpdoots

* Stop that, me.
2019-11-04 21:38:02 -05:00
Mechoid
551dd02a80 Setup for New Library 2019-11-04 21:25:18 -05:00
Schnayy
d4e38581cc Adds new FBP brand + sprite. (#6513) 2019-11-03 13:34:52 -05:00
Soft
2a01058620 Changes the pepsi machine sprite to something more generic and flashy
Changes the soda machine sprite because pepsi is lame
2019-11-03 05:54:08 -05:00
Verkister
91c8018a59 Merge branch 'master' into littlefunfixes 2019-11-01 20:52:20 +02:00
Novacat
4e58ae7609 Merge pull request #6151 from VOREStation/upstream-merge-6507
[MIRROR] [READY] Recolourable energy weapons.
2019-11-01 13:33:02 -04:00
Novacat
412ce591ca Merge pull request #6153 from VOREStation/upstream-merge-6509
[MIRROR] Fixes adding verbs to mobs in varedit.
2019-11-01 13:02:49 -04:00
Atermonera
c9b595f564 Merge pull request #6509 from Verkister/patch-27
Fixes adding verbs to mobs in varedit.
2019-11-01 12:41:36 -04:00
Atermonera
3bfc63143e Merge pull request #6508 from Verkister/patch-26
Fixes simplemobs wandering when grabbed.
2019-11-01 12:39:20 -04:00
lolman360
ae859c49e9 [READY] Recolourable energy weapons. (#6507) 2019-11-01 12:38:06 -04:00
Verkister
5f432b24c0 or is it 2019-11-01 08:17:01 +02:00
Verkister
9079262d08 oop 2019-10-31 17:52:13 +02:00
Verkister
d181812987 Fixes high endurance bodies dying in grower pod
The math that was supposed to protect low endurance bodies had been mistakenly calculating the clone damage reduction with a double-negative, causing the opposite effect. The cloneloss added on top of the maxhealth apparently was intended to get a reduction of 25hp, but because the number it was being reduced from was already negative, it was instead causing a high endurance body (125 maxhealth) receive a total of 125+75 cloneloss
2019-10-31 17:14:53 +02:00
Verkister
ec71920801 More stuff.
-Gives the mob radio a much easier way of implementation. (Just take the item and boop the mob with it to do the entire setup. Booping a radio enabled mob with another will eject the mob's current radio without replacing it so you'll need to boop the emptied mob again to apply the new radio)
-Adds some additional stability to the borg sleeper clean cycle.
-Fixes unequipped sleeperbellies never ceasing to process and update, which had been causing runtime spam and such when undeploying an occupied sleeperbelly.
-Tweaks the gurgle gainz received from digested body parts.
-Earlyports a fix for unconscious borgs never dying.
2019-10-31 15:39:51 +02:00
Verkister
e28722b64d A bunch of little fixes and event features.
-Adds simplemob radio. A "headset" that can be used and listened on by simplemobs. Adminspawn the item, shove it into your mob's contents, and link a reference to the item into the mob's mob_radio var. Additional keys can be added same way as regular headsets before "implanting" into the mob.
-Adds leap/pounce verb for simplemobs. Essentially a copy of how the dogborg pounce works.
-Couple fixes to borg/animal pounces. (makes the pounce "animation" reset to default_y instead of hardcoded crap. Also disables spin on simplemobs when pouncing. Unfun maybe, but that var can always be toggled ingame to get the sick ninja moves)
-Adds adminbus switch to enable abuse mode on trasheater. (only skips the whitelist, blacklist still applies)
-Fixes a bunch of icon updates on the vorecode. Humanmobs no longer get forced canary runtiming mob icon updates, and the existing mob icon updates are no longer simplemob exclusive (and thus broken for pAIs and such)
-Earlyports a fix for mobs wandering off when grabbed.
-Earlyports a fix for adding verbs to mobs via varedit. (Was utterly broken for anything that wasn't STRICTLY a root type of human, robot, or AI. Also now works for simplemobs as well.)
2019-10-31 14:27:18 +02:00
Novacat
9656d60306 Merge pull request #6143 from VOREStation/upstream-merge-6505
[MIRROR] Fixes runtime in tension.dm
2019-10-30 21:25:20 -04:00
Anewbe
c7e21a5412 Merge pull request #6505 from Heroman3003/tension
Fixes runtime in tension.dm
2019-10-30 21:01:34 -04:00
Anewbe
52ea82ae2c Merge pull request #6506 from Heroman3003/mech-runtime-roundstart-fix
Switches equipped mechs to use initialize instead of new
2019-10-30 21:00:21 -04:00
Novacat
9eb9fd4b51 Merge pull request #6141 from KasparoVy/clip_that
Amends Clipping Logic - Fixes Issue with Space-suits & Taurs
2019-10-30 20:36:05 -04:00
KasparoVy
5ea24daf70 Amends Clipping Logic - Fixes Issue with Space-suits & Taurs
Fixes an issue whereby a suit that has the HIDETAIL flag that is worn by a taur would not be clipped.

This presents itself as tails sprited into spacesuits sticking out beneath a taur. Looks wack
2019-10-30 00:36:07 -04:00
Novacat
693be7ce3e Merge pull request #6130 from Poojawa/patch-1
turns cryo player searching for carbon mobs only
2019-10-29 22:09:26 -04:00
Anewbe
d7c0195212 Merge pull request #6500 from KasparoVy/you_tracking_implanted_the_floor
Loadout Implants Properly go in Mob, not on Floor
2019-10-29 20:34:36 -04:00
Novacat
45d9730737 Merge pull request #6134 from VOREStation/upstream-merge-6494
[MIRROR] Add Sounds to stuff! (Port from VOREStation)
2019-10-29 17:44:53 -04:00