cyberpresidentvanellope/VOREStation
1
0
Fork 0
mirror of https://github.com/VOREStation/VOREStation.git synced 2026-03-23 20:23:12 +00:00
Code Issues Packages Projects Releases Wiki Activity
63,999 Commits 8 Branches 26 Tags
41973fcdecec468a83258c4de4e9db77e91fbc3b
Commit Graph

30247 Commits

Author SHA1 Message Date
C.L
41973fcdec Mining bugfix 
Some turfs didn't have the proper resource name to be spawned so it resulted in bugs.
 2022-09-30 18:21:06 -04:00
DESKTOP-4BUBN9N\Mike
9e159dce7d Enhances pakkuns 2022-09-28 03:46:15 +01:00
Heroman
efda78326d Adjusts abandoned crate content self-destruct 2022-09-26 08:13:05 +10:00
Casey
c72edf2a81 Merge pull request #13802 from radiantAurora/radiantAurora-markings 
Markings care package
 2022-09-25 16:48:14 -04:00
Casey
d2dc661f22 Merge pull request #13801 from Heroman3003/climbfix 
Allows simplemobs to climb lattices
 2022-09-25 16:47:45 -04:00
Casey
619024f492 Merge pull request #13800 from Heroman3003/enzymefix 
Removes old, janky-ass, unnecesary slowdown from numbing enzyme.
 2022-09-25 16:47:19 -04:00
Casey
fe004aefc3 Merge pull request #13799 from Cameron653/MINING_ADJUSTMENTS 
Mining adjustments
 2022-09-25 16:46:54 -04:00
radiantAurora
871fb3940e Update sprite_accessories_extra.dm 2022-09-25 16:41:55 +01:00
radiantAurora
e5aee8292f Update sprite_accessories_ear_vr.dm 2022-09-25 16:40:26 +01:00
radiantAurora
c85efd7501 Update sprite_accessories_extra.dm 2022-09-25 12:40:14 +01:00
Heroman
2d481c510d Allows simplemobs to climb lattices 2022-09-25 18:04:20 +10:00
C.L
2947a9bbf8 NOT TODO ANYMORE 2022-09-25 03:58:04 -04:00
C.L
300a6f243b Makes ore chunks have better sprites. 2022-09-25 03:56:16 -04:00
C.L
be7dc9dc4d Adds ore chunks 2022-09-25 03:32:04 -04:00
C.L
22f1b561e5 A few more changes. Makes bluespace ore satchel better. 
- Makes the mining satchel pick stuff up a bit differently.
- Adds a failsafe for mining satchels so you can't pick up too many items at once. (set to 100)
- Makes the bluespace ore satchel ACTUALLY bluespace.
- Adds 'current capacity' so ore satchels and mining drills can only hold a certain amount.
 2022-09-25 03:01:23 -04:00
Heroman
fc9d8c0a56 Removes old, janky-ass, unnecesary slowdown from numbing enzyme. 2022-09-25 16:51:45 +10:00
C.L
ead04ced8d Minor modifications 2022-09-25 02:11:12 -04:00
C.L
8d64ece4e4 Fixes the drill 2022-09-25 02:02:33 -04:00
C.L
76c7b3f003 Makes the mining drill use lists. Updates some ore names. 
Uses the same magical anti-lag lists as the other mining items!
Some mining drill items had incorrect names, such as glass being 'silicates' which isn't an ore, which is essential for this change. This changes that.

This is purely a name change and users won't see anything different.

Also removed rutile as it was duplicated in the list. Presumably due to Polaris adding rutile and it never being removed.
 2022-09-25 01:20:55 -04:00
C.L
adc941c700 Makes ore boxes, bags, and the processing machine use lists. 
- Makes Ore boxes, ore bags, and the processing machine all use lists.

Previously, ore boxes would constantly add ore to the contents of the ore box.
This meant that if a miner was constantly adding ore to a crate that has thousands of ores in its contents list, the contents list would be updated numerous times in succession.

Updating a list with 10000 ore 25 times in a single tick makes the server cry.

Making it use lists completely eliminates this problem and makes the entire process of ore more efficient. It simply adds the amount of ores to a list and transfers them between satchel/bag/processing machine.

Using lists means the infinite mining satchel can actually be infinite without worries of constantly dropping & picking up ore and lagging the server.

This has been tested and works.

The only problem however is that I need to figure out a way to make mining bags able to know if they're full or not. Currently they can hold an infinite value of ores.
 2022-09-25 00:43:13 -04:00
C.L
c79ccbc103 Adds advanced ore scanner to mining vendor 
I didn't even realize this was a thing and I doubt many other miners did.
 2022-09-24 22:04:02 -04:00
C.L
3f10466788 Merge pull request #13290 from VOREStation/upstream-merge-8660 
[MIRROR] Adds some core behavior code, uses it to fix a small bug (ABLE TO BE MERGED)
 2022-09-24 21:21:24 -04:00
C.L
ccd8156d67 Fixes things 2022-09-24 21:09:53 -04:00
C.L
b1608ff77e i want to brutalize rats 
let me spawn them
 2022-09-24 01:24:46 -04:00
Heroman
6e24ace309 Makes sect abdomen glow colorable 2022-09-24 07:57:06 +10:00
C.L
84181ef54e Release Bugfixes and changes (MERGE BEFORE RELEASE) (#13787) 
* Add bricks

* Fixes concrete icon spawning.

Polaris uses a different system for spawning turfs than we do. This fixes a bug with concrete spawning.

* Makes it so you have to load PB in a cryo beaker.

Instead of getting it for free.

* no you don't get free reinforcement

* Concrete can make concrete flooring

* Adds concrete tiles. Fixes spawning

* Being plating is boring. Let's make it a floor.

* Able to remove it.

* Allows fun. Fixes infinite tiles.

* Adds Polaris Gun Sprites

- Allows for easier ports.
- Fixes the semi-automatic-shotgun

* Adds the PSGs - Tether. Fixes the sprite in DreamMaker.

- Adds a PSG to the security EVA (Security players mentioned doing this instead of armory, and it makes sense.)
- Adds a PSG to mining equipment room.

* Adds PSGs to SD

- Adds PSG to Security EVA
- Adds PSG to Mining

* Adds PSGs to GB

- Adds PSG to Groundbase Mining
- Adds PSG to Groundbase Security EVA

* Makes the PSG the actual mining version
 2022-09-23 01:01:24 -04:00
VirgoBot
d67a95c46f [MIRROR] Fixes directional overlays on padded comfy and rounded chairs (ABLE TO BE MERGED) (#13010) 
* Fixes directional overlays on padded comfy and rounded chairs

* Fixes mirror conflicts (#13411)

* Update chairs.dm

* Update chairs.dm

Co-authored-by: Cerebulon <tanhindmarsh@yahoo.com>
Co-authored-by: Poojawa <Poojawa@users.noreply.github.com>
Co-authored-by: C.L <killer65311@gmail.com>
 2022-09-22 21:07:39 -04:00
VirgoBot
6af5b1796a [MIRROR] pool swimwear locker names, holo floor/item names (ABLE TO BE MERGED) (#12920) 
* pool swimwear locker names, holo floor/item names

* Update HolodeckObjects.dm

Co-authored-by: Sypsoti <98442665+Sypsoti@users.noreply.github.com>
Co-authored-by: C.L <killer65311@gmail.com>
 2022-09-22 21:07:00 -04:00
VirgoBot
67059e3634 [MIRROR] Bartending enhancements (ABLE TO BE MERGED) (#12971) 
* Bartending enhancements

* Update glass.dm

* Update drinks.dm

* Update drinks.dm

* Update hospitality.dm

* Update dispenser_presets.dm

* Update dispenser_presets.dm

* Update vending_machines.dm

* Update vending_machines.dm

* Update chemical.dmi

* Revert "Update chemical.dmi"

This reverts commit abc8ba097c.

* Update chemical.dmi

* Update cartridge_presets.dm

* squish

Co-authored-by: Atermonera <atermonera@gmail.com>
Co-authored-by: C.L <killer65311@gmail.com>
 2022-09-22 21:05:14 -04:00
VirgoBot
de58b679e2 [MIRROR] Adds Sjorgen Inertial Shotgun (by H-H) (ABLE TO BE MERGED) (#12899) 
* Adds Sjorgen Inertial Shotgun (by H-H)

* Update munitions.dm

* Update visible_weapons.dm

* Update shotgun.dm

* Update guns_and_ammo.dm

* Update munitions.dm

* Update guns_and_ammo.dm

Co-authored-by: Atermonera <atermonera@gmail.com>
Co-authored-by: C.L <killer65311@gmail.com>
 2022-09-22 21:05:00 -04:00
VirgoBot
0b39510898 [MIRROR] Cellcharge artifact effect iterates over shorter lists (ABLE TO BE MERGED) (#13507) 
* Cellcharge artifact effect iterates over shorter lists

* Update cellcharge.dm

* Update cellcharge.dm

Co-authored-by: Atermonera <atermonera@gmail.com>
Co-authored-by: C.L <killer65311@gmail.com>
 2022-09-22 21:04:12 -04:00
VirgoBot
14b7d4d82b [MIRROR] Skips traits that aren't implemented yet. (ABLE TO BE MERGED) (#13165) 
* Merge pull request #8655 from MistakeNot4892/traitfix

Skips traits that aren't implemented yet.

* Skips traits that aren't implemented yet.

Co-authored-by: Atermonera <atermonera@gmail.com>
 2022-09-22 21:03:37 -04:00
VirgoBot
1a8f1760fa [MIRROR] conk rete (ABLE TO BE MERGED) (#13467) 
* conk rete

* Update flooring_premade.dm

* Update wall_types.dm

* Update _materials.dm

* Update plasteel.dm

* Update steel.dm

* Update stone.dm

* Update stone.dm

* Update instant.dm

* Update plasteel.dm

* Fixes map changes

Co-authored-by: Greenjoe12345 <33647525+Greenjoe12345@users.noreply.github.com>
Co-authored-by: C.L <killer65311@gmail.com>
 2022-09-22 21:03:19 -04:00
Casey
c7badae23e Merge pull request #13783 from Kegsey/Sottovoce 
Sottovoce Fluff Item
 2022-09-22 20:58:57 -04:00
Casey
20ed147503 Merge pull request #13782 from Very-Soft/instadigest 
Buffs Vore
 2022-09-22 20:58:06 -04:00
Casey
bfa1362da2 Merge pull request #13780 from ItsSelis/tooltips-stuff 
Loads jquery from the Server instead of a CDN
 2022-09-22 20:57:43 -04:00
Casey
c5d135a815 Merge pull request #13779 from Heroman3003/ascended-fix 
Fixes ascended donk pocket
 2022-09-22 20:57:31 -04:00
Casey
a061809140 Merge pull request #13778 from Heroman3003/medichines-runtime 
Fixes runtime with medichines deletion
 2022-09-22 20:57:20 -04:00
Casey
15fc9ab3ff Merge pull request #13777 from Heroman3003/teleport-runtime 
Fixes teleport artifact not unbuckling mobs properly
 2022-09-22 20:57:09 -04:00
Casey
7daab19fc7 Merge pull request #13776 from Heroman3003/pickup-fix 
Fixes micro pick-up temporary toggle to work properly
 2022-09-22 20:56:44 -04:00
Casey
eb7ef5fc7c Merge pull request #13774 from Heroman3003/altevian-batch-x 
Adds a ton more altevian stuff
 2022-09-22 20:56:24 -04:00
Casey
26334b328a Merge pull request #13771 from Heroman3003/hotfood-nerf 
Removes hotfood vendors from station spawning
 2022-09-22 20:55:28 -04:00
Casey
5b113e56fb Merge pull request #13770 from Heroman3003/borgfix 
Fixes dogborg inbuilt belly deaths not counting as vore deaths
 2022-09-22 20:55:17 -04:00
Casey
7d6bb4f7ed Merge pull request #13769 from Cameron653/RADIOACTIVE 
Radiation Rework
 2022-09-22 20:55:08 -04:00
Casey
59e21d704f Merge pull request #13767 from Heroman3003/lang-autosay 
Fixes a few bugs/runtimes
 2022-09-22 20:54:34 -04:00
Casey
f2fb02756e Merge pull request #13766 from Cameron653/xenoarch_hotfix2 
Hotfixes xenoarch tools
 2022-09-22 20:54:26 -04:00
Casey
61a333250e Merge pull request #13763 from Heroman3003/ladder 
Makes ladder climb time variable
 2022-09-22 20:54:11 -04:00
Casey
d105238544 Merge pull request #13762 from Heroman3003/pakkunfix 
Fixes pakkun stuff
 2022-09-22 20:53:43 -04:00
Casey
b2428a58c5 Merge pull request #13760 from VOREStation/droppred 
Makes mob droppred handles on vore init instead of variable on the mob.
 2022-09-22 20:53:16 -04:00
Casey
d824f88630 Merge pull request #13759 from Heroman3003/more-fixes-yet 
Fixes two more runtimes hopefully
 2022-09-22 20:52:59 -04:00