Commit Graph
2680 Commits
Author SHA1 Message Date
izac112 aa8016bddd Merge branch 'release' of https://github.com/VOREStation/VOREStation into voreupdate 2025-01-14 02:20:30 +01:00
KashargulandGitHub 59b9802628 some istype to macros (#16826) 2025-01-06 06:45:02 +10:00
KashargulandGitHub 987be6070d bunch of inits without return and a few easy new to init (#16815)
* bunch of inits withou return

* Update cans.dm

* bunch of New to Init

* fix that

* .

* .

* move black hole to init and callbacks

* .

* oups, should not do that late at night

* some more without returns
2025-01-02 18:31:38 +01:00
KashargulandGitHub 2876996214 some more strings to defines (#16810)
* some more strings to defines

* fix init order

* .

* .
2025-01-02 08:34:09 +01:00
KashargulandGitHub e6ef8b0f2c resize limits and designer / dna update (#16807)
* resize limits and designer / dna update

* .

* genes to mobs

* .

* Update designer.dm

* Update designer.dm

* species cleanup
2025-01-01 18:23:20 +10:00
izac112 5a63e93153 Merge branch 'release' of https://github.com/VOREStation/VOREStation into voreupdate 2024-12-28 14:43:02 +01:00
68139d12a5 ERvent release (#16770)
* Winter event mobs (#16768)

Added christmas catslug variant.

Added a grey scaled drake variant of the dragon, specifically intended to be played by the creator of the art for the upcoming event (and future events), as it's not quite polished yet for every day use. Though they are fine with it being used in other ways here and downstream if desired. The creator is grayscaledrake.

* fix (#16767)

* Makes limbs able to be chopped off with reasonable limits (#16766)

Moves around limb code a bit to make cutting/destroying limbs ACTUALLY possible.

Previously, destroying a limb required you to:
1. Reach the person's max_damage to even let you start having a _chance_ to destroy the limb.
2. Have to have a REALLY strong weapon to destroy/cut limbs. We're talking about a weapon requiring 50 to 80 damage depending on the limb to destroy it.
3. Even IF you managed to get a weapon that could destroy a limb, you STILL had a random prob() based on the damage dealt in that blow.

This changes it so instead of requiring you to reach the limb's max_damage to start having chances to drop, it makes it so limbs have two factors: How damaged the limb currently is AND how strong the blow it.

This still has thresholds. You can't grab a 5 damage butterknife and chop people's limbs off. But if you step in a 30 damage beatrap, or have a 45 damage rock drop on your hand, it might actually get gibbed or knocked off!

* initial ghost spawn is important... (#16760)

* initia ghostl spawn is important...

* .

* On demand belly loading & multibelly (#16758)

* Moves simple mob belly loading to on demans

* style

* early

* multibelly

* even more human

* .

* bunch of update_fullness

* animals need an icon refresh

* the icon has the fullness part, optimize that

* one more

* Add launch eject option for vore panel (#16755)

* Small bugfixes / clarifications (#16763)

* Fixes mech cloak having the wrong path

From Outpost21 Commit a64c3ad.

* clarified player record console buttons

"Player had issue with button confusion, and reviewing the buttons they are WAY too similar. changed refuse update to DENY to ensure no at-a-glance confusion"

From Outpost 21 Commit 32bc6f7

* simple doors use their own bump timer and not the user's

simple material doors no longer use the USER'S last bump time, and isntead use their own for locking interaction. They now open promptly when bonked into and close after some time when clicked (they are meant to be slow after all)

The bug was casued by using the user's bump time. So if youtouched anything like a wall within the last 60 ticks (including the door itself) it wouldn't open

From Outpost21 Commit 783ef0a

* ears + horns (#16764)

* few more defines (#16765)

* Allows borg tasers to properly charge when in charging ports (#16753)

* taser

* Adds sanity check

* Turret & Sound Optimizations (#16754)

* Portable Turret Optimization

Optimizes portable turrets. Takes from Chomp PR here: https://github.com/CHOMPStation2/CHOMPStation2/pull/8088

Optimizes them further by changing mobs_in_xray_view to mobs_in_view.
Reason: mobs_in_xray_view was adding mobs that were out of sight (behind walls) to the target list and trying to do pathfinding to shoot them. If you had 20 mobs around a PoI with turrets, it'd use a LOT of CPU needlessly.

Also adds in Chomp's /mobs.dm helpers as they're helpful.

* Ports over Chompstation Sound Optimizations

- Replaces for( listeners) with a check that sees if a listener is ALSO a hearer

- Makes it so even if there is no vary, if someone has a frequency it uses the frequency for playsound_local

From https://github.com/CHOMPStation2/CHOMPStation2/pull/8088

---------

Co-authored-by: SatinIsle <98125273+SatinIsle@users.noreply.github.com>
Co-authored-by: Guti <32563288+TheCaramelion@users.noreply.github.com>
Co-authored-by: Cameron Lennox <killer65311@gmail.com>
Co-authored-by: Kashargul <144968721+Kashargul@users.noreply.github.com>
Co-authored-by: ShadowLarkens <shadowlarkens@gmail.com>
Co-authored-by: dan <75939194+PastelPrinceDan@users.noreply.github.com>
2024-12-28 09:44:41 +10:00
KashargulandGitHub c31886151f few more defines (#16765) 2024-12-28 09:42:44 +10:00
SatinIsleandGitHub c41b1351fd Chem dispenser water bottle fix (#16738)
Fixed water cooler bottles (which have a volume of 2000u) being able to be placed in chemical dispensers.
2024-12-23 07:34:45 +10:00
KashargulandGitHub 365b4fbf2a oups small mistake (#16737)
* oups small mistake

* one more

* fix turf tracking
2024-12-21 22:14:52 +01:00
KashargulandGitHub 3428cb1921 fix bodyscanner (#16735)
* fix bodyscanner

* improve performance on that

* .

* fix those

* Update ghostnet.dm
2024-12-19 15:41:42 +10:00
Cameron LennoxandGitHub 87a58a8cd4 Makes unabsorb chem NOT infinitely hallucinate you! (#16714) 2024-12-16 10:07:46 +10:00
KashargulandGitHub 3083f0b730 Adds a new ghost vis blocking area flag (#16696)
* Adds a new ghost vis blocking area flag

* .

* .

* .

* .

* .,

* .

* .

* .

* .

* .

* .

* .

* .

* .

* .

* some more

* add admin verbs to add and remove areas

* .
2024-12-16 10:02:07 +10:00
izac112 f3e3905b41 Merge branch 'release' of https://github.com/VOREStation/VOREStation into voreupdate 2024-12-11 20:18:19 +01:00
ShadowLarkensandGitHub 5a47c9b8a1 Check for 516 byond:// hrefs (#16359)
* Add a lint to check for hrefs that don't start with byond://

* Regex convert href links

* Regex convert _src_ as well

* Clean up the last few

* Missed a few
2024-12-11 08:33:17 +10:00
Kashargul 8d6bf161a8 cleanup the last 2024-12-08 20:54:28 +01:00
KashargulandGitHub a88c58dde7 Merge branch 'master' into reagentToDefines 2024-12-08 15:41:21 +01:00
Killian ef78be37ce space traffic updates 2024-12-08 08:00:55 +00:00
Kashargul 4e7742e3c8 food.dm 2024-12-08 04:26:19 +01:00
Kashargul e9550345d2 half of the food and drinks 2024-12-08 01:14:10 +01:00
Kashargul 5d14c2affa only food left... 2024-12-07 02:16:23 +01:00
Kashargul 1d8d5b34b5 medicine.dm 2024-12-07 02:10:10 +01:00
Kashargul a12a4d2d5e toxins.dm 2024-12-07 01:03:25 +01:00
Kashargul 2bd0f9c14d other.dm 2024-12-07 00:12:42 +01:00
Kashargul 0b303a3ae5 bunch of fixes 2024-12-06 23:29:36 +01:00
Kashargul c64a251504 mecdicine_vr 2024-12-06 22:47:10 +01:00
Kashargul 5398ec84bf few more 2024-12-06 22:26:07 +01:00
Kashargul e0972e8325 virology 2024-12-06 22:12:35 +01:00
KashargulandGitHub 939fcbb488 Merge branch 'master' into reagentToDefines 2024-12-06 21:57:14 +01:00
Kashargul 429398bdd7 some moire 2024-12-06 21:54:05 +01:00
KillianandGitHub 553675edf5 Merge branch 'master' into kk-spacetraffic 2024-12-06 20:45:06 +00:00
Heroman3003andGitHub fd4f187ea1 Merge pull request #16669 from SatinIsle/coffeeeeeee
Barista love
2024-12-07 05:08:01 +10:00
Heroman3003andGitHub 146c3f4140 Merge pull request #16659 from TheCaramelion/Viro-Update-1
Virology Update 1
2024-12-07 05:06:20 +10:00
Kashargul 80edcd2c3d Converts gas, mat and reagent strings to defines 2024-12-06 17:26:00 +01:00
Killian 3beebc746f Update pill_vr.dm 2024-12-05 09:03:48 +00:00
SatinIsle b1c1ab88ac Cargo orderable and a couple more flavours 2024-12-04 18:13:25 +00:00
izac112 68e5bf9d42 Merge branch 'release' of https://github.com/VOREStation/VOREStation into voreupdate-2 2024-12-04 15:21:21 +01:00
izac112 87ce13b27c Merge branch 'release' of https://github.com/VOREStation/VOREStation into voreupdate-2 2024-12-04 15:17:00 +01:00
SatinIsle 4cf5beeabe Added more cup sizes
Added tall, grande and venti cups that get named similarly to the normal cups.

Added ginger and gingerbread syrups, on request of my wife, lol.
2024-12-03 20:06:57 +00:00
SatinIsle 35503f3113 Barista love
Added a new dispenser to cafes on each station, the syrup dispenser. These just add flavoured syrups to your drinks, but don't do much unique by themselves. This allows people to customise their coffee more.

Added a whole bunch of flavoured syrups, such as pumpkin spice, chocolate, irish cream and more.

Added new coffee recipes, including things like americano, macchiato, breve, cappuccino and mocha. Unfortunately flat white and latte would cannibalise other recipes if they just used milk and coffee, so they use drip coffee instead.

Added a few new coffee reagents, drip brewed coffee and milk foam.

Changed coffee cups to now include the name or description (in the var cup_prefix) of certain additional reagents. For example, if you have a cup with 25u of mocha and 5u of pumpkin spice, it will take the name "cup of pumpkin spice mocha". A lot of existing reagents have had these added too.

Added a wall locker with additional cups to every station cafe.

Added pineapple juice as an option to the soda vendor.
2024-12-03 14:35:45 +00:00
Killian e9aafd2826 Merge remote-tracking branch 'upstream/master' into kk-spacetraffic 2024-12-02 06:08:55 +00:00
Killian 9d3a7986d8 traffic update
more khi cleanup
2024-12-01 18:37:08 +00:00
izac112 a2ad915045 Device and weapon 2024-12-01 00:56:26 +01:00
izac112 058f219cb9 Merge branch 'release' of https://github.com/VOREStation/VOREStation into voreupdate 2024-11-30 23:30:26 +01:00
Guti 3cf6aa9f2a Size stuffs 2024-11-30 17:06:02 +01:00
Heroman3003andGitHub 96cd99127a Merge pull request #16618 from ShadowLarkens/ui
Kitchen UI Update
2024-11-30 14:41:27 +10:00
Guti 823db69af5 Merge branch 'master' into Viro-Update-1 2024-11-29 22:56:42 +01:00
Kashargul 938ab8af7c Merge branch 'master' of github.com:Kashargul/VOREStation into usr-to-user-up-to-player_effects 2024-11-27 23:53:06 +01:00
Guti 9f52fc0b1c Sick stuff 2024-11-25 17:05:54 +01:00
ShadowLarkens 1ee1e40993 Make the grinder always show a radial menu, no autopick 2024-11-18 05:49:25 -08:00