Skip to content

Cigarette and Food Accessibility Overhaul #829

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
wants to merge 21 commits into from

Conversation

AmoryBlaine
Copy link
Contributor

@AmoryBlaine AmoryBlaine commented Mar 7, 2025

About the pull request

Kills the uglier WY vendor, and greatly reduces the amount of Koorlander themed vendors. Removes the food and coffee vendor on the Garrow and loadout to encourage bitching about lack of options to alternate drinks and food, and adds an expensive cigarette vendor to the Garrow to encourage purchases at vending machines planetside and even more bitching. Also makes a lot of colony vendors only partially stocked.

Explain why it's good for the game

Testing Photographs and Procedure

Screenshots & Videos

Put screenshots and videos here with an empty line between the screenshots and the <details> tags.

Changelog

🆑 The32bitguy, AmoryBlaine
add: RNG code for vendor stocking, immersive cigarette pricing, more options to vendors
/:cl:

Copy link
Contributor

@AndroBetel AndroBetel left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

linters, something wrong with maps

@AndroBetel AndroBetel marked this pull request as draft March 17, 2025 15:14
6bc0165: maps/map_files/golden_arrow/golden_arrow.dmm

Automatically commited by: tools\mapmerge2\fixup.py
@AmoryBlaine AmoryBlaine changed the title Edits to cigarette additions [WIP] Edits to cigarette additions Mar 17, 2025
@AmoryBlaine AmoryBlaine reopened this Apr 8, 2025
@cm13-github
Copy link
Contributor

This pull request has conflicts, please resolve those before we can evaluate the pull request.

@cm13-github
Copy link
Contributor

Conflicts have been resolved. A maintainer will review the pull request shortly.

@AmoryBlaine AmoryBlaine marked this pull request as ready for review April 10, 2025 22:32
@AmoryBlaine AmoryBlaine changed the title [WIP] Edits to cigarette additions Cigarette Accessibility Overhaul Apr 11, 2025
@AmoryBlaine AmoryBlaine changed the title Cigarette Accessibility Overhaul Cigarette and Food Accessibility Overhaul Apr 11, 2025
@cm13-github
Copy link
Contributor

cm13-github commented Apr 12, 2025

Test merge deployment history:

Test Merge Deployed @ 04/12/2025 12:49:54 +00:00:
Server Instance

PVECM: Green

Merged By

Athena14

Revision

Origin: f42638d
Pull Request: 49fce55
Server: 7c042bb766b6080fc072f1a93fa40a1b8a69ecae

Test Merge Updated @ 04/12/2025 15:43:54 +00:00:
Server Instance

PVECM: Green

Merged By

MessageCypher

Revision

Origin: f42638d
Pull Request: 49fce55
Server: 79b90577dd3777e9469ee4f607a86012d98af7c3

Test Merge Updated @ 04/12/2025 15:47:43 +00:00:
Server Instance

PVECM: Green

Merged By

MessageCypher

Revision

Origin: f42638d
Pull Request: 49fce55
Server: 135f6aa0c8531af9c2203ec9aa1af18473e0501f

Test Merge Updated @ 04/12/2025 19:16:22 +00:00:
Server Instance

PVECM: Green

Merged By

Wettowels

Revision

Origin: f42638d
Pull Request: 49fce55
Server: 90e78c79d9834526355dada4e896644920968867

Test Merge Updated @ 04/12/2025 19:31:20 +00:00:
Server Instance

PVECM: Green

Merged By

Athena14

Revision

Origin: f42638d
Pull Request: 49fce55
Server: 7742d05d656572a435c200e700f9fb1228b620dd

Test Merge Updated @ 04/12/2025 20:55:27 +00:00:
Server Instance

PVECM: Green

Merged By

lordloko

Revision

Origin: f42638d
Pull Request: 49fce55
Server: d1436b100b125d0c582d48da70eab0764c624084

Test Merge Updated @ 04/13/2025 00:15:27 +00:00:
Server Instance

PVECM: Green

Merged By

SpartanBobby

Revision

Origin: f42638d
Pull Request: 49fce55
Server: 145ffe944a47c3989e5c437f6f5426f7a229d8b3

Test Merge Removed @ 04/13/2025 13:20:12 +00:00:
Server Instance

PVECM: Green

Test Merge Deployed @ 04/13/2025 14:39:20 +00:00:
Server Instance

PVECM: Red

Merged By

MessageCypher

Revision

Origin: 785d59a
Pull Request: 49fce55
Server: c97cad73658f2f050c5fb1fccd132862cf755d8c

Test Merge Updated @ 04/13/2025 14:43:55 +00:00:
Server Instance

PVECM: Red

Merged By

MessageCypher

Revision

Origin: 785d59a
Pull Request: 49fce55
Server: 40c318c79ce3412b26004ade753b16c8a092eb1b

Test Merge Updated @ 04/13/2025 15:15:00 +00:00:
Server Instance

PVECM: Red

Merged By

MessageCypher

Revision

Origin: 785d59a
Pull Request: 49fce55
Server: 38aec3653bb5dfc18babb9441ad4d3c7fdb324dc

Test Merge Removed @ 04/15/2025 00:16:11 +00:00:
Server Instance

PVECM: Red

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants