77 Commits

Author SHA1 Message Date
Spookerton 978f4511a5 examine signature changed to include distance
- distance is INFINITE, 0, or a positive integer based on get_dist() between
the examiner and examinee's turfs when they are on the same Z. When the
examiner is dead or a ghost, distance is always 0.
- also updates /examine( implementations to use it!
- adds w_class_to_name proc for reusing "It is a X item." examine behavior.
2024-01-31 13:49:52 +00:00
klorpa f445ffde0a Spelling Fixes (#8973)
* SpellingFixes

* OtherTypos

* OtherTypos
2023-04-08 21:39:28 -08:00
Cerebulon 3b8bd577b0 Justice for AcmeCo (#9054)
* Justice for AcmeCo

* cig grammar unification
2023-03-24 22:56:30 -08:00
MistakeNot4892 9b7ba12c89 Cleaning up storage attackby. 2022-11-16 14:02:54 +11:00
spookerton ffba11e5ab rename a bunch of atom flags 2022-10-18 09:36:41 +01:00
spookerton 3abdbbaa1c replaces atom.initialized with ATOM_INITIALIZED
refactors atom/var/flags to atom_flags and area_flags
moves NOBLOODY, NOBLUDGEON, and PHORONGUARD to item_flags instead of atom_flags
corrects various misapplied flags
2022-10-18 09:36:36 +01:00
spookerton 1ccb2df2de trivial 1:1 overlays -> overlay proc changes
NB. In some cases we go from a more complex image() to a single icon_state string and I assume this works for every case but do not care to check because of the sheer scale of extra fiddly effort. Buyer beware, not my code.
2022-04-24 07:50:21 +01:00
atermonera 7a9806d9b4 Removes weapons 2022-04-17 19:14:32 -08:00
BillyBangles 2a4228b5b2 Makes custom cigarettes even more custom-ier (#7925)
* can now add multiple items to rolling papers

* adds blunt wraps and blunts

* un-scuffs the scuffed code
more scuffed up than a wooden middle school gym floor after a dodgeball game

* further optimization
2021-03-18 22:20:41 -09:00
Cerebulon 811cd0b47e Vendor enhancement fixes (#7577)
* Vendor enhancement fixes

* skrellsnax trash, tuna name
2020-08-29 23:47:17 -07:00
Rykka 0c7a7fd2b8 Massive Ambience and Sound Overhaul + Addition, Squashed Commit Edition 2020-08-21 06:53:05 -04:00
Cerebulon cbce774745 typos, lighters, trash 2020-08-10 01:27:30 +01:00
Cerebulon 0f146f3349 Flavour Enhancement: Vending 2020-08-09 05:05:43 +01:00
Cerebulon 03b7a0ea0d Persistent Trash/Dirt/Graffiti/Notices (#7337)
* Port Trash/Writing Persistence from World

* stuff beyond straight portin

* Fixed admin menu

* Config, cigbutts, blood exceptions, offices....

* mapped butts
2020-07-24 02:23:34 -07:00
Aronai Sieyes 6c6644f86c Rewrite examine() to pass a list around (#7038) 2020-04-29 13:42:16 -07:00
listerla 02f97a116e Adds ecigs and vaping (#6753)
* Adds ecigs and vaping

* Uncomments ssobj

Co-authored-by: lemon <lemon@localhost.localdomain>
2020-03-06 07:09:24 -08:00
Cerebulon f801cc95be Allows precision placement of most items 2020-02-19 21:16:26 +00:00
Arokha Sieyes 5b15917d32 to_chat replacing stream operator 2020-02-17 13:14:08 -05:00
Shadow 6088899908 Round One 2020-01-11 02:25:38 -06:00
Novacat 7f49c680e5 Ports MREs from Baystation (#6424)
* Ports MREs from Baystation

- Ports MREs from Baystation
- Adds an 'Emergency ration' that contains liquidfood rations
- Two new ration packs that have the new rations.

* Placates travis

* Lynxlog

* Adds liquidprotein rations

* Sacrifice for travis

* Changes desc

* Fixing missing filling in crayon paste

* Fixes missing side for random rations

* Renames Paste Supplypack

* aaaaa minor error

* Slight organization

* Fixes some errors

* Why am I like this
2019-08-31 14:00:14 -08:00
Anewbe 95f980b202 Merge pull request #5825 from PolarisSS13/butt_boxing
Adds ability to put butts in boxes
2019-01-14 20:22:34 -06:00
Cerebulon 5d601302b7 Religion Overhaul 2019-01-12 05:35:53 +00:00
Neerti 1764748f06 Adds ability to put butts in boxes
Specifically cigarette butts in cigarette boxes, and cigar butts in cigar boxes.
2019-01-10 18:43:16 -05:00
kevinz000 c2c688c4c8 caps 2018-12-06 18:34:37 -08:00
Leshana 1f4bdc4389 Reverted use of 'usr' back to 'user' from commit 05fd53ebcc 2018-04-01 22:03:10 -04:00
Billy Bangles d953a58413 travis pls
why must we argue so
2018-03-19 21:23:48 -04:00
Billy Bangles 05fd53ebcc adds permanent markers
also tweaks paint recipe to use ink instead of crayons.
2018-03-19 20:20:31 -04:00
BillyBangles 6ff1f1b165 fixes #4992 (#4995)
i'm good at this i swear
2018-03-02 18:24:51 -08:00
BillyBangles 2ab9bfe79b Turns the station into 420-station 13. (#4971)
* adds rolling paper and joints

F O U R T W E N T Y   B L A Z E   I T

* adds joint sprites

(they're pretty bad though)

* adds rolling paper box, adds papers to cig vendors

* c h a n g e l o g

smoke
weed
every
day
2018-02-28 14:16:42 -06:00
Anewbe a42d7ecdb4 Merge pull request #4944 from VOREStation/pol-matweak
Tweak weird MA override
2018-02-25 12:38:58 -06:00
Arokha Sieyes 542bb57d0d POLARIS: Tweak weird MA override
Not sure when this is used, but Leshana had a good suggestion for preventing it interfering with things.
2018-02-24 13:13:10 -05:00
Schnayy 8ccf0f7532 AlliCo Hallmark Goods (#4887)
* Adds the gift vendor, AlliCo Hallmark Goods, ran the name by Elgeon beforehand. Is a delightfully gaudy vending machine placed in the locker rooms. The coffee machine was removed and the sweatmax moved to take it's place so the gift vendor is next to the laptop and cigarette vendors. Prices were based off of the SweatMax vendor.

Before: https://i.gyazo.com/0d6758fc8a469fea6e340b5937b95f82.png
After: https://i.gyazo.com/ab21b6ff7ed012786d475b71f1ec180e.png

Vendor will normally dispense:
- Heart box chocolates
- Bouquets
- Cheaper fake bouquets
- Each of the 4 cards previously added.
- All the therapy dolls.

Will dispense the following with a coin:
- All small plushies
- Newly added trinket box.

Will dispense the following when hacked:
- Gilthari Luxury Champagne
- Plans to add a handbuzzer in the future but not right now.

Items & Reagents added:

- Champagne. Is not a mixable reagent, listed as a child of wine.
- Gilthari Luxury Champagne. Contains said reagent.
- Trinket box. Think an engagement ring box, except it can also hold coins and medals. May be toggled open/closed, when opened it's description will say what's inside. Can only hold one item. Thanks to Mechoid for helping me code this mess. https://i.gyazo.com/7a16faada015ef0795a4db2ec6429e68.png
- Also goes in and fixes a small bug with the heart box saying it contains donuts when it does, in fact, not contain donuts.

Side note, mapping things in is scary!!!

* In the process of fixing the map merger nonsense w/ mechoid's help.

* We're almost there lads.

* If this doesn't work I'll cry.

* Changes name to AlliCo Baubles and Confectioneries, fixes conflict (hopefully), and adds friendship bracelets to vendor.

* REVERTING ITEMS.DMI. Attempting to fix conflict.

* Recommitting items.dmi

* One last attempt to fix the conflict before I make some bigger changes to get this through.

* Removed conflicting file and committed out calls on the sprite. Will readd in separate PR.

* now with 20% less silly
2018-02-24 11:01:23 -06:00
Leshana 1c7a9c6837 Fixes VOREStation/VOREStation#3075 - Boxes of Chocolates say they contain donuts. 2018-02-22 15:25:33 -05:00
Arokha Sieyes 3178b95b6c POLARIS: Moves most boxes to use starts_with 2018-02-18 13:29:21 -06:00
Schnayy 02447e5c19 The largest PR I've probably actually done. Adds the following:
* Bouquets
* Fake Bouquets. Can be won from arcade machines.
* Heart box chocolates containing a set arrangement of chocolates.
* Adds said chocolates (milk chocolate, white chocolate, and truffles) all bite-sized.
* Adds 5 cards, one blank and four with covers. Function identical to paper except you can't make an airplane because I hate fun.
* Adds The four cards with covers, 3 real bouquets, and 2 chocolate boxes to cargo under a 'gift crate' for 10 points.

Sprites by me. Code would not be possible without cerebul's help. Let me know if I've goofed on something, but I did test all of the items + ordering them from cargo.
2018-02-15 03:33:23 -06:00
Anewbe 2b81c0ed63 Merge pull request #2525 from Neerti/9/21/2016_w_class_defines
Centralizes weight class / inventory definitions
2016-09-22 16:46:05 -05:00
Neerti 828dacf485 Centralizes weight class definitions
A lot of new defines are now in inventory_sizes.dm, which contains;
All the size identifiers (the thing that tells the game if something is bulky, or w/e).
Storage costs for all the sizes, which are exponents of two, as previously.
A few constants for inventory size.

Also changes all storage item's capacity definitions by basing it off of how many 'normal slots' exist for it.  This allows one to change the definition for all of the defines in the file, and everything will follow along without needing to change 500 files.  In testing, I made all ITEMSIZE_COST_* defines doubled, and nothing had broke.

The benefit of doing all of this is that it makes adding new weight classes in the future much simpler, and makes knowing how much space a container has easier, as seeing ITEMSIZE_COST_NORMAL * 7 means it can hold seven normal items.
2016-09-22 00:51:51 -04:00
comma 7af5606bab Adding a article 2016-09-21 17:30:32 +01:00
comma 297a5a936c Makes cigs branded too
Description of cig/cigbutt would reveal its brand for dastardly murdersolving revelations.
2016-09-21 17:26:51 +01:00
redstryker ac81a5003c Examine Cigarette Lore 2016-08-28 16:04:07 -04:00
SinTwo 8e9676aa26 storage item item_state fix 2016-07-24 00:19:45 -04:00
SinTwo 7192bf08fd item_state cleanup 2016-07-11 22:31:32 -04:00
Neerti 25c04df5bd Polaris tweaks.
Fixes mistake involving belts.
Fixes mistake involving bags allowing w_class 5 items, which was from the manual merge.
Polaris tweaks

Makes inflatables w_class 3.
Spacesuits and RIGs are now w_class 5.
Both sniper weapons are now w_class 5.
Makes more inventories able to use the volume based system.
Cleans up the cig part of the port a bit.
2016-04-06 07:48:09 -04:00
Neerti 469c01daf9 Manually ports Bay's volume inventory system. 2016-04-06 03:31:21 -04:00
Zuhayr f93ea6a78f Tweaks to previous commits.
More tweaks to IPC fixes.
Merge resolution/compile fixes.

Further work on properly integrating, updating and fixing prosthetic options.

Repathed internal organs to organ/internal.

More work on full synthetics, changelings, overheating.

Working on getting organs to qdel properly and spawn properly when robotized.

Finalized some overheating values, added remaining prosthetic icons.

Finalizing the testing version of the full prosthetic bodies branch.

Added suit cyclers to the autolathe and map.

Fixing runtime errors.

Fixing errors.

Changelog.

Replacing limb and organ strings with constants.

Prevented brainless species from becoming full cyborgs.

Fixed issues with brain/MMIs renaming themselves inappropriately.

Various fixes and oversights.
2015-12-24 21:13:40 +10:30
Zuhayr 000438aa94 Allowed lighters to be put into cigarette packets. 2015-12-11 15:55:15 +10:30
Earthcrusher 61c8140c01 My first contribution to Polaris! Adds a few new brands of cigarettes to vending machines. 2015-12-03 21:20:11 -06:00
Vivalas 0bf5145e24 Name change 2015-10-01 13:35:26 -05:00
Vivalas d2c355a937 Adds in KillerKickthroats 2015-09-30 17:56:35 -05:00
PsiOmegaDelta d1e8f670b2 qdel(reagent) adjustments.
Attempts to ensure qdel(reagents) only occur once per Destroy()
2015-08-13 10:26:31 +02:00