izac112
d841463eb5
Merge branch 'izac' of https://github.com/Yawn-Wider/YWPolarisVore ; branch 'release' of https://github.com/VOREStation/VOREStation into izac
2022-04-27 16:11:36 +02:00
Casey and GitHub
eab59c1476
Merge pull request #12829 from GhostActual/salvage_plus
...
Salvage+
2022-04-26 17:15:33 -04:00
Casey and GitHub
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
izac112
646b359e7b
Merge branch 'release' of https://github.com/VOREStation/VOREStation into izac
2022-04-20 22:19:52 +02:00
GhostActual
1ac8b601a6
Base Commit
2022-04-15 04:19:08 -04:00
Killian
39d14dd0ca
more new/init fixes
2022-04-13 03:51:04 +01:00
FartMaster69420
d220b9b73d
Near final
2022-04-09 22:26:03 -04:00
izac112
31b42f636a
Merge branch 'release' of https://github.com/VOREStation/VOREStation into izac
2022-04-07 16:59:48 +02: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
izac112
2a815d66d2
Merge branch 'release' of https://github.com/VOREStation/VOREStation into izac
2022-04-03 16:56:15 +02:00
Casey and GitHub
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 and GitHub
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 and GitHub
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 and GitHub
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 and VirgoBot
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
izac112
cb17c4daf4
Merge branch 'release' of https://github.com/VOREStation/VOREStation into izac
2022-03-26 19:03:28 +01:00
GhostActual
7dced2cc17
Base Commit
2022-03-24 16:35:34 -04:00
Killian
f5200c2694
initialize cleanup
2022-03-23 03:51:29 +00:00
izac112
068da2c612
Merge branch 'release' of https://github.com/VOREStation/VOREStation into izac
2022-03-22 20:15:54 +01:00
Novacat and GitHub
4dbc7fe6bf
Merge branch 'master' into upstream-merge-8298
2022-03-22 08:53:45 -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
Killian
8db7eb9173
Update simple_doors.dm
...
actually fix simple door init properly
2022-03-08 08:03:09 +00:00
Killian
196453543d
fix a couple more bad inits
2022-03-08 07:58:12 +00:00
izac112
74ee064587
Merge branch 'release' of https://github.com/VOREStation/VOREStation into izac
2022-03-07 16:16:38 +01:00
Pandora and GitHub
a9a959ab89
The locker room's two blocks down
2022-03-06 16:26:38 +00:00
Novacat and GitHub
dda7396cfe
Merge branch 'master' into upstream-merge-8298
2022-03-04 09:57:28 -05:00
Casey and GitHub
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
izac112
cd567345bf
Merge branch 'release' of https://github.com/VOREStation/VOREStation into izac
2022-03-02 02:10:00 +01: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
Killian
ba16daab2b
cleanup
...
restored vinestart landmark and antagcheck for borers, cleaned up maploads
2022-02-20 23:01:27 +00:00
izac112
d1e595e7e7
Merge branch 'release' of https://github.com/VOREStation/VOREStation into izac
2022-02-20 23:23:34 +01:00
Killian
91d39da943
new->init refactor
2022-02-20 19:32:23 +00:00
izac112
aef8a94e94
Merge branch 'release' of https://github.com/VOREStation/VOREStation into izac
2022-02-19 18:19:45 +01:00
Heroman
ae267030eb
Merge branch 'master' into upstream-merge-8222
2022-02-19 18:41:29 +10:00
Casey and GitHub
1432ca2b22
Merge pull request #12253 from GhostActual/Donk-Co.-Toys
...
Donk Co. Toys
2022-02-18 23:26:48 -05:00
Casey and GitHub
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
izac112