ItsSelis
af64bcf406
More Input Conversion
2022-06-19 12:21:51 +02:00
ItsSelis
4a9784c2a0
Merge branch 'master' of https://github.com/VOREStation/VOREStation into upstream-merge-8644-fix
2022-06-18 14:58:10 +02:00
ItsSelis
bb87687017
Resolve conflicts
2022-06-18 14:57:51 +02:00
ItsSelis
9069ca7f35
Enables to un-anchor the Bins
2022-06-16 15:46:26 +02:00
Ketrai
0937f3a381
Cooking QOL V2
2022-06-05 20:17:44 -04:00
Burrito Justice
32561a3715
heckin lake map bruhhhh
2022-05-28 21:11:20 -07:00
Pandora
4a8a2fd6a0
grrr, commas
2022-05-22 00:30:49 +01:00
Pandora
3baf4b9453
Adjusts CE starting equipment
2022-05-21 23:14:34 +01:00
Heroman
5e181fb78b
Fixes runtimes being broken. Removes back-worn watertanks. NO I DO NOT KNOW HOW IT IS RELATED IT JUST IS
2022-05-14 19:13:45 +10:00
Heroman
329a6ac8d3
Adds chemistry kits
2022-05-08 09:22:55 +10:00
Casey
eab59c1476
Merge pull request #12829 from GhostActual/salvage_plus
...
Salvage+
2022-04-26 17:15:33 -04:00
Casey
41741010cb
Merge pull request #12583 from VOREStation/upstream-merge-8468
...
[MIRROR] Fixes catwalks making footsteps on everything
2022-04-26 16:47:42 -04:00
GhostActual
11dadacb63
Base Commit
2022-04-24 23:38:09 -04:00
Heroman
383c356312
Adds gradual sizegun
2022-04-24 16:40:42 +10:00
GhostActual
1ac8b601a6
Base Commit
2022-04-15 04:19:08 -04:00
FartMaster69420
d220b9b73d
Near final
2022-04-09 22:26:03 -04:00
VerySoft
b84da2bbea
Adjusts trees and vendor spawners
...
Added some weights to the vendor spawners, basically so the hotfoods vendor will appear less often than any other, and some of the more powerful/special vendors appear less often than the normal ones.
Also adjusts the bigtrees. They were originally made just for gateway decoration, but with GB featuring them, they needed to be brought into line with normal stuff. They still have more health than normal trees, but it's less. Also they have stump sprites now.
2022-04-05 20:23:23 -04:00
Casey
b9473ccb94
Merge pull request #12592 from GhostActual/tg-port-6
...
The Grand /TG Port - Part 6
2022-04-02 23:31:31 -04:00
Casey
5d9f0462c1
Merge pull request #12579 from GhostActual/tg-port-5
...
The Grand /TG Port - Part 5
2022-04-02 23:30:27 -04:00
Casey
73589bb510
Merge pull request #12578 from GhostActual/tg-port-4
...
The Grand /TG Port - Part 4
2022-04-02 23:28:42 -04:00
Casey
561f6e3571
Merge pull request #12577 from GhostActual/tg-port-3
...
The Grand /TG Port - Part 3
2022-04-02 23:27:40 -04:00
GhostActual
3d57004141
Base Commit
2022-04-01 13:45:16 -04:00
GhostActual
801533a69f
Revert "Base Commit"
...
This reverts commit 1de45df2ba
2022-04-01 13:39:44 -04:00
GhostActual
1de45df2ba
Base Commit
2022-04-01 13:33:51 -04:00
Spookerton
8aee6f371f
Merge pull request #8468 from Verkister/patch-88
...
Fixes catwalks making footsteps on everything
2022-04-01 13:26:25 -04:00
GhostActual
ef2ef019cb
Base Commit
2022-04-01 03:33:58 -04:00
GhostActual
59c9199ace
Base Commit
2022-04-01 02:42:14 -04:00
GhostActual
d97ffa3c16
Base Commit
2022-04-01 02:04:21 -04:00
GhostActual
b268b7bcfa
Base Commit
2022-04-01 01:03:30 -04:00
GhostActual
7dced2cc17
Base Commit
2022-03-24 16:35:34 -04:00
GhostActual
47b9f404f6
Base Commit
...
Whoops
Not supposed to be here
Idea I had in the middle of the night that wanted to add
2022-03-18 23:50:00 -04:00
Pandora
a9a959ab89
The locker room's two blocks down
2022-03-06 16:26:38 +00:00
Casey
27b451a2c8
Merge pull request #12353 from GhostActual/Ammo_Boxes
...
Ammo Boxes
2022-03-03 16:22:34 -05:00
VerySoft
2153a45288
Change painting persist decay
...
Instead of paintings lasting 1000 shifts before being deleted
Now the system will store up to 1000 paintings, and remove the one at the top of the list (the earliest/oldest one) first when the maximum number of paintings is exceeded.
Additionally, examining a painting that has been stored will move it to the bottom of the list, effectively renewing its lease in the system.
This should make it so that paintings aren't just arbitrarily being removed for being old, and, the paintings that actually get looked at should stick around.
2022-03-01 20:50:05 -05:00
klaasjared
e4ed93e11d
Shotgun Ammo Boxes
...
Replaces all ammo boxes with new ammo box type (Alt-Click to remove shells) - put in separate Commit in case Admins don't want this
(Compile Fixes)
2022-03-01 01:27:54 -05:00
DESKTOP-4BUBN9N\Mike
cf20e1fe39
I could break the president in two with my bare hands!
2022-02-26 08:56:02 +00:00
Heroman
ae267030eb
Merge branch 'master' into upstream-merge-8222
2022-02-19 18:41:29 +10:00
Casey
1432ca2b22
Merge pull request #12253 from GhostActual/Donk-Co.-Toys
...
Donk Co. Toys
2022-02-18 23:26:48 -05:00
Casey
de8906e315
Merge pull request #12247 from ktccd0/ktccd-dev-Corner-Sofa-Fix
...
Fixes sofa paths
2022-02-18 14:04:56 -05:00
klaasjared
e8e7bf3990
Toy Guns
...
Toy Guns 2
Toy Guns 3
Toy Guns 4
2022-02-17 21:04:03 -05:00
klaasjared
6550b428d2
Base Commit
2022-02-17 00:00:57 -05:00
ktccd0
210ba28c6b
Undoes corp sofa fix
...
This undoes my fix for the corporate sofas specifically. Their object subtyping is awful, but there is enough redundant code in there to make the layers work correctly for them anyway.
2022-02-16 15:07:22 +01:00
ktccd0
618f11ad3e
Fixes sofa paths
...
Sofas used to have really weird subtypes, now they correctly inherit from either the base (middle), left, right, or corner, which solves the issue with layers on the non-red corner sofas (which red sofas were exempt from due to them being the base object type).
2022-02-16 14:48:28 +01:00
klaasjared
58fe8ef497
Base Commit
...
Tresh
2022-02-16 01:50:14 -05:00
Killian
3abb52f578
heavy-duty engi gloves
...
today's word is "funkoscopy"
2022-02-14 13:00:26 +00:00
PastelPrinceDan
ad7a96bfa3
talon mining
2022-02-06 22:51:28 +00:00
Casey
c399a15853
Merge pull request #12151 from PastelPrinceDan/catslugcrate
...
adds a catslug crate to cargo
2022-02-06 09:16:05 -05:00
Casey
77e267a620
Merge pull request #12146 from Hatterhat/formal-in-the-loosest-sense
...
skimpy cap "dress" probably more like a leotard idk
2022-02-06 09:13:56 -05:00
Casey
eeb09d1125
Merge pull request #11763 from KillianKirilenko/kk-talon
...
Talon Improvements, Take 2
2022-02-06 09:06:51 -05:00
PastelPrinceDan
25c1f8ed29
catslug (contained)
2022-02-05 18:33:39 +00:00
