Commit Graph

32 Commits

Author SHA1 Message Date
c420-o
7e0bb2783b Swag outfit added (#56491)
Swag outfit added
2021-01-29 19:55:23 -08:00
ArcaneMusic
5338ad1696 Re-assesses 99% of vending prices through Arconomics to match player resources and round-length. (#54715)
* The Re-pricening

* Rewritten and adjusted for paycheck defines.

* I made the map changes finally.

* And the refills too.

* "OH YEAH REPLACING IT ALL WITH DEFINES AND SCALING IT THE EXCEL DOCUMENT WILL BE EASY, ARCANE!!!"

* And the premium ones too.

* Accidently spoiled a future pr due to dme bleedover
2020-11-13 16:17:22 -05:00
Rohesie
6ff08e1c69 Color standardization, vars moved, and signals (#52574)
Defined all the existing light_color values.
    Moved their definitions to colors.dm
    Made white the default color. It was so already, but that was very obscured.
    Moved the atom light-related variables to the atom definition.
    Wrapped changes to variables such as light_color into procs that report the event through signals.
    Moved the light_on variable to the atom level, also adding a signal for its changing, to represent toggling lights.
    Cleaned up a little bit of code in where new variables were defined before redefinitions.

This is all atomization to reduce changes in #52413
None of this affect gameplay at all, it's all code cleaning and refactoring.

There's more colors to standardize, a search for color = will find lots of targets, and I see little need to have both the LIGHT_COLOR and COLOR patterns, but I don't want to make this PR bigger than it already is.
2020-08-04 13:59:48 +12:00
Galdar02
ed95c6a999 Merge remote-tracking branch 'origin/TheBootBranch' into TheBootBranch 2020-07-20 14:41:42 -05:00
Galdar02
ec2fd242f1 THE COAT BAYBEEEE 2020-07-20 14:40:42 -05:00
Galdar02
f77e3fb027 fuk 2020-07-20 03:28:55 -05:00
Galdar02
b6a4563c08 Puts the Winter Boots into the Clothsmate
What it says on the tin
2020-07-20 02:45:12 -05:00
Rob Bailey
2f127f8b95 More glowing stuff (#50109)
* vending machine framework

* wip

* all vending masks

* more glowing stuff

* dynamic unsetting of luminosity

* use define
2020-03-22 23:38:50 -03:00
plapatin
a8fb93d896 nanotrasen-brand spacepod changes 2020-02-16 13:20:36 -08:00
Mickyan
0b3e1b524a Functional headphones (#48908)
* headphones

* adds element for mob icon updates

* corrects some "user" errors, literally

* now using signals

* removes extra space
2020-02-13 16:38:15 +01:00
Paxilmaniac
b8b2d23616 Revert "space pods damage your ears"
This reverts commit ee400cbcb4.
2020-01-12 12:00:02 -08:00
Paxilmaniac
ee400cbcb4 space pods damage your ears
TURN YOUR FUCKING RAP MUSIC VOLUME DOWN
2020-01-12 11:37:57 -08:00
Paxilmaniac
f3d037929c subtypes are very cool
hi x2
2020-01-11 20:49:40 -08:00
Paxilmaniac
6d09cfb5a0 adds nanotrasen space pods
not those shitty space travel things, they are actually offbrand airpods
2020-01-11 19:00:16 -08:00
Mickyan
55f19df748 Normalizes payouts and vendor prices to an approximate of cargo's credit value (#48174)
* prices & income

* more prices

* lower megaseed premium prices

* custom prices for premium tools

* slightly lowers prices for some snacks/drinks/cigs

* hey get back here
2019-12-16 17:43:27 +01:00
ArcaneMusic
d7c6471aa8 Adds 2 Suspender Subtypes, gives suspenders a new toggle, and adds Mystic Robes (#47821)
* Blue, Gray suspenders

* Adds suit toggle for X-Y suspenders for some reason

* Psijic monk robes and hood, toggles, all good to go.

* Cleans up magic pixels, tones down colors.

* Inhand sprites are in.

* Suspenders exist on the map somewhere

* BEGONE FORELORN PIXELS OF YORE
2019-11-25 23:12:05 +01:00
Rob Bailey
6a26744d83 Clothing /under repath (#45548)
About The Pull Request

repaths clothing/under to be more sane
Also fixed a couple of bugs relating to pathing being incorrect, and modified a couple of bad descriptions and names
Also adds a map path updating script, which also helps show the full repath.
Why It's Good For The Game

improves maintainability, makes mapping easier, stages for a clothing dmi split
Changelog

cl
refactor: repathed all under clothing, keep an eye out for errors
/cl
2019-07-30 19:20:21 +12:00
Twaticus
2b4c123fc0 Skirt Update (#45244)
About The Pull Request

Some skirt sprites were offset i dont know how this happened i swear i fixed this before but apparently not. Fixed the assistant skirt necklines being way too high. Added extra details on some skirts.
Added 5 previously missing skirts including 2 lawyers skirts(like they dont have enough already), rainbow, syndicate and tacticool. Fixed the disorganized mess that was the Lawdrobe.
Why It's Good For The Game

Updated skirts good. Rainbow skirt good. Skirtleneck good.
Changelog

cl
add: The long lost rainbow jumpskirt has been found
add: Rumor has it that even the syndicate have started producing skirts for their operatives
tweak: Department skirt necklines are more in-line with their jumpsuit counterparts, sprites are no longer offset, added detail
/cl
2019-07-19 22:39:41 +12:00
Krysonism
1edc7fb582 Add cowboy boots! (#44880)
This PR adds 6 new types of cowboy boots. Brown, black and white
cowboy boots have been added to the clothesmate. Two types of lizard
skin boots can be crafted, these boots can then be exported for money.
An additional pair of fancy boots are currently unobtainable, but will
be part of a future project. Cowboy boots can now act as shelter for
some type of snakelike creatures, fill a pair with snakes as a prank
or harebrained assassination plot.
2019-07-05 12:08:22 -07:00
Twaticus
0cd4ca69a5 Department Skirts (#44776)
About The Pull Request

Adds department skirts to all related lockers/vendors

Why It's Good For The Game

Skirts good
Changelog

cl
add: added department skirts
fix: fixed secskirt dixel
/cl
2019-06-29 21:01:44 +12:00
moo
c55dbf97f4 Vending Machine Input Framework & Clothing Vendor Inputs (#43964)
About The Pull Request

I didn't like how the wardrobe replaced lockers but you couldn't clean up after yourself say once you switched to the nurse's outfit as a doctor. Now, anyone can put clothes in a wardrobe so long as that clothing is a vendable product of said wardrobe (No engineering jumpsuits in science vendor, etc.).

Building off the previous snack machine vendor, this lays the framework for ALL vendors to allow all sorts of items to be inputted into vendors, all you have to do is change canLoadItem(obj/item/I,mob/user) to TRUE for the items you want the vendor to accept! It also has an option to restrict loading by changing canload_access_list. NOTE: having any of the access permits input instead of all access is needed to input (important distinction!)

ECONOMY: This will make it so any clothes you put in becomes a sellable product. It does NOT make it free unless you can already access the vendor's contents for free.

Code improvement + minor QoL with minute balance implications. If you want to discuss how making it easier to clean up your unused clothes makes it more difficult for antags to sneak then I'm in trouble lol.
Why It's Good For The Game
Changelog

cl ExcessiveUseOfVending
tweak: Wardrobe Vendors will now accept clothing types they sell. Now you can clean up after getting that cool alternate uniform!
code: see PR #43964 on how to easily setup a vending machine to accept items!
/cl
2019-05-27 22:24:58 +12:00
Farquaar
3dbc8c3c12 Adds a Bunch of New Religious Clothing Items (#43841)
* Adds the rasta beanie

* Added Bishop Mitre

* Added some more religious headgear

Clown Mitre (Hat of the Honkmother)
Kippah
White and Red Taqiyahs
Medieval Jewish Hat

* Fixes icon_state for the Hat of the Honkmother

* Added some new chaplain outfits

Bishop Robe
Monk's Frock (with hood)
Eastern Monk's Robe
White Robe

* Added Robes of the Honkmother

* Added new religion hat icons

Bishop Mitre
Clown Mitre
Kippah
Red and White Taqiyahs
Medieval Jew Hat
Rasta Beanie

* Added new religion suit icons

Bishop Robe
Monk's frock
Eastern Monk's Robe
White robe

* Added new religious suits

* Added new religious headgear

* Added in-hand sprites for new religious suits

* Added new religious clothing to the chaplaindrobe

Includes new premium and contraband objects.

* Added clown priest's robes to premium

* Added some religion follower hats

Kippah
Taqiyah (red)

* Added rastacap to the chaplain vendor

* Fixed obj directory for red taqiyah

* Fixed spelling of "dreadlocks

* Allowed clown robes to hold prank items

* Created .dm for chaplain suits

For easy organization

* Removed clown priest robes

Put them in chaplainsuits.dm

* Moved new chaplain suits

To chaplainsuits.dm

* Moved holiday priest

to chaplainsuits.dm

* Moved holiday priest to chaplainsuits.dm

* Updated suit obj defines, added monk's frock

* Updated obj defines for chaplain suits

* Updated holiday priest obj define

* Updated chaplainsuit obj defines, added white robes

* Fixed subtype define

Man, that was an embarrassing spelling mistake

* Fixed subtype define

For real this time I hope

* Added chaplainsuits.dm

* Fixed clown robes

* Updated holiday priest path

* Updated path for chaplainsuits

* Re-added prank items to clown robe storage

* Updated pathing for chaplain suits on Pubby

* Added comments

Hopefully this will help the AppVeyor check go through
2019-05-10 15:01:45 -04:00
Tlaltecuhtli
fde4c92638 fixes vending machines not having refill parts (#43314)
* 1

* 2
2019-03-28 01:55:50 -04:00
Mickyan
e831716127 Hairstyling update (#42907)
* good hair day

* fluff

* vendor/fixes

* removes redundant loc check

* cobby reviews
2019-03-05 12:23:00 -05:00
gy1ta23
b547cc9bfb Fixes immersion ruining clothesmate line (#42684)
* Update clothesmate.dm

* Update code/modules/vending/clothesmate.dm

Co-Authored-By: gy1ta23 <44277885+gy1ta23@users.noreply.github.com>
2019-02-07 15:00:55 -05:00
Mickyan
d1b10b2691 Vendor tweaks & prices: take 2 (#40927)
* vendor tweaks

* i was never good at cooking

* soda

* boozeomat sorting

* updated ramen desc
2018-10-22 08:40:24 +13:00
Iamgoofball
f735a7d34d [READY][PAID CODE] economy PR (#40312)
With the power of CAPITALISM AND ECONOMY, you too could be This Guy.
2018-09-23 02:50:51 -04:00
Tad Hardesty
eaf8bc3b42 Merge remote-tracking branch 'upstream/master' into patch/vending-machines 2018-06-19 13:07:13 -07:00
Hyacinth
fe1b73f070 Adds pink scarf to vendomat 2018-06-18 10:01:28 -07:00
Tad Hardesty
870ac15480 Improve how vending machine restocking works 2018-06-16 23:02:41 -07:00
Firecage
c1f10aecce Adds department wardrobe vendors to the code and to Boxstation. (#37859)
* Adds wardrobe vending machines.

* Adds the refill cartridges to cargo.

* Removes access requierments and fixes spelling errors.

* More spelling errors fixed, curse the English language.

* Added sec skirts and grey uniforms to the sec vendor, and added formal uniforms as premium items to it.

* Fixing some grammer/spelling errors and adds the purple bartender uniform to the vendor.

* .

* Does Shizzy's requested changes.

* Adds these machines as options at the vendor circuit board. Adds more product ads.

* Fixes compile error.

* Sprite fix and two more things to the MediDrobe.

* adds the sprites

* Adds the vendors to box station.

* splits the supply packs up into different departments. Costs adjusted to be consistent with the autodrobe crate.
2018-05-21 19:12:22 -04:00
John Ginnane
3e1db725c1 Modularises vending machines (#36508)
* Modularises vending machines

Each machine now has its own file, which includes it's refill cannister for easy maintenance

* Moved and renamed vending file
2018-03-21 16:33:39 -04:00