Commit Graph
2669 Commits
Author SHA1 Message Date
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
NovacatandGitHub 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
PandoraandGitHub a9a959ab89 The locker room's two blocks down 2022-03-06 16:26:38 +00:00
NovacatandGitHub dda7396cfe Merge branch 'master' into upstream-merge-8298 2022-03-04 09:57:28 -05:00
CaseyandGitHub 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
CaseyandGitHub 1432ca2b22 Merge pull request #12253 from GhostActual/Donk-Co.-Toys
Donk Co. Toys
2022-02-18 23:26:48 -05:00
CaseyandGitHub 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
IgnusVam 98ba6e9e84 Small tweaks
Reduced belts in mining to 1.
Annotation improvements.
Moved YW signage to its own file.
2022-02-14 10:45:53 -07:00
Killian 3abb52f578 heavy-duty engi gloves
today's word is "funkoscopy"
2022-02-14 13:00:26 +00:00
IgnusVam ca690d5dee Map changes, lighting, new janitor sign, major fix to sec armory.
- New plant in cargo (grinch stole the old one)
- Fixed misplaced doors in engineering.
- Added lights in: Cargo, cargo hallway, security staircase, warden hallway, green armory, medical EMT, security airlock.
- Fixed typo in drone pod crash event.
- Added a power cell charger in mining
- Added janitor department sign, placed appropriately.
- Moved frostlamp outside teleporter airlock, shouldn't wander inside as much.
- Removed binocs in mining, replaced with belts.
- Adjusted Blue armory and Engineering tool storage to greatly increase wall security.
- Fixed a triplet of scrubbers and vents in engineering tool storage.
- Removed atmos pipes that led into walls.
2022-02-13 21:54:44 -07:00
izac112 19c8752ec7 Merge branch 'release' of https://github.com/VOREStation/VOREStation into izac 2022-02-08 12:05:20 +01:00
PastelPrinceDan ad7a96bfa3 talon mining 2022-02-06 22:51:28 +00:00
CaseyandGitHub c399a15853 Merge pull request #12151 from PastelPrinceDan/catslugcrate
adds a catslug crate to cargo
2022-02-06 09:16:05 -05:00
CaseyandGitHub 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
CaseyandGitHub 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
Hatterhat dd3b2bb51d brought to you by /v/ sings - Bury the Light 2022-02-03 03:35:10 -06:00
izac112 d92c10262f Merge branch 'release' of https://github.com/VOREStation/VOREStation into izac 2022-01-23 11:41:20 +01:00
Killian 6c960fea54 Merge remote-tracking branch 'upstream/master' into kk-talon 2022-01-17 08:55:24 +00:00
Heroman c700309efd Fixes wrench dropping when deconstructing low wall + allows normal climbing 2022-01-16 16:12:14 +10:00
izac112 3e5743e808 Merge branch 'release' of https://github.com/VOREStation/VOREStation into izac 2022-01-15 23:24:58 +01:00
VerySoft 3992250aee Removes the announcement for main pred and morph spawns
The announcement only really encourages people to go hunting for it, and usually not in the good way, which can in general ruin the surprise that these roles can employ.

So! I think it would be better if we just didn't announce them publicly, since they aren't a thing we ever want people to go and respond to mechanically, and, I think that announcements like these ought to be reserved for things we want people responding to.
2022-01-11 12:23:12 -05:00
izac112 2b7293163b Merge branch 'release' of https://github.com/VOREStation/VOREStation into izac 2022-01-09 00:57:35 +01:00
Heroman 582db5d9d3 Grammar fixes 2021-12-23 16:36:25 +10:00
Heroman 29a0bce573 Fixes g 2021-12-23 16:28:48 +10:00
Heroman d65d379c4b Adjusts descriptions and flavor texts of painting frames 2021-12-23 16:23:21 +10:00
Killian 67e159fff2 Update walllocker.dm 2021-12-16 01:52:57 +00:00
Killian 433439c47c Merge remote-tracking branch 'upstream/master' into kk-talon 2021-12-16 01:51:50 +00:00
Killian 790800e3e2 Update walllocker.dm 2021-12-16 01:34:35 +00:00