92 Commits
Author SHA1 Message Date
KashargulandGitHub d75f90466d removes all var/ in procs (#12738) 2026-05-05 10:55:04 +02:00
afcea67115 [MIRROR] Gripper fixes (#12714)
Co-authored-by: Cameron Lennox <killer65311@gmail.com>
2026-04-26 21:53:22 -04:00
89704592dd [MIRROR] jobs, access and radio to defines (#11546)
Co-authored-by: Kashargul <144968721+Kashargul@users.noreply.github.com>
2025-08-31 03:56:12 +02:00
495c373e69 [MIRROR] ticker followup (#11474)
Co-authored-by: Kashargul <144968721+Kashargul@users.noreply.github.com>
2025-08-20 20:40:53 +02:00
c844cc3dee [MIRROR] Finish Machinery new to init (#10439)
Co-authored-by: Kashargul <144968721+Kashargul@users.noreply.github.com>
2025-03-16 15:44:59 +01:00
ce2446922e [MIRROR] Initialize fixing (#10335)
Co-authored-by: Kashargul <144968721+Kashargul@users.noreply.github.com>
2025-03-08 22:22:04 +01:00
ad0915a957 [MIRROR] some more new to init (#10270)
Co-authored-by: Kashargul <144968721+Kashargul@users.noreply.github.com>
2025-03-02 02:31:24 +01:00
499e8e7ee9 [MIRROR] removes center of mass list (#10081)
Co-authored-by: Kashargul <144968721+Kashargul@users.noreply.github.com>
2025-02-07 15:08:58 +01:00
fd5d9267ff [MIRROR] Converts gas, ore, plants and reagent strings to defines (#9611)
Co-authored-by: Heroman3003 <31296024+Heroman3003@users.noreply.github.com>
Co-authored-by: Kashargul <144968721+Kashargul@users.noreply.github.com>
2024-12-12 02:11:06 +01:00
0180cc74c5 [MIRROR] usr to user up to player effects (#9552)
Co-authored-by: Heroman3003 <31296024+Heroman3003@users.noreply.github.com>
Co-authored-by: Kashargul <144968721+Kashargul@users.noreply.github.com>
2024-12-01 18:31:19 +01:00
ab154b48b2 [MIRROR] refactors most spans (#9139)
Co-authored-by: Heroman3003 <31296024+Heroman3003@users.noreply.github.com>
Co-authored-by: Kashargul <KashL@t-online.de>
2024-10-04 15:00:17 +02:00
5ea698a0ef [MIRROR] Removes /obj/item/weapon and /obj/item/device [MDB IGNORE] (#9084)
Co-authored-by: Changelogs <action@github.com>
Co-authored-by: Heroman3003 <31296024+Heroman3003@users.noreply.github.com>
Co-authored-by: Guti <32563288+TheCaramelion@users.noreply.github.com>
Co-authored-by: Kashargul <144968721+Kashargul@users.noreply.github.com>
Co-authored-by: Kashargul <KashL@t-online.de>
2024-09-30 21:36:41 +02:00
CadynandGitHub cf1db3c049 Memory tracking shenanigans (#8359) 2024-05-15 16:56:31 +02:00
3995338290 Moar whitespace normalization [MDB IGNORE] (#7750)
Co-authored-by: Raeschen <rycoop29@gmail.com>
2024-02-16 10:54:47 +01:00
Heroman3003andCHOMPStation2 fa4fff0a4c Merge pull request #14961 from Youtubeboy139/Lighters_&_cigs
"Hey bud, need a light?"
2023-06-09 22:43:24 +00:00
Heroman3003andCHOMPStation2 6a06a3836f Merge pull request #14897 from Youtubeboy139/fixes_egg
Fixes #14896
2023-05-26 20:56:39 +00:00
CaseyandCHOMPStation2 d552e834a1 The Grand /TG Port - Part 2 2022-04-03 03:27:36 +00:00
CHOMPStation2andGitHub e79f88adfe powder that makes you say yes 2021-12-09 23:40:10 -07:00
CaseyandChompstation Bot b897e76c07 Fix for issue #5643 2021-12-10 06:13:28 +00:00
NadyrandGitHub 033a33f739 powder that makes you say yes 2021-10-27 19:07:24 -04:00
Chompstation Bot 21ad9c1e79 Restricts candle boxes to only hold candles 2021-10-27 15:41:48 +00:00
Chompstation Bot b99adcaca4 Add pouches! 2021-07-06 01:00:11 +00:00
Chompstation Bot 55e3dc7904 Port current /tg/ lighting system 2021-06-18 04:23:09 +00:00
NovacatandChompstation Bot a4bf657c59 Merge pull request #9973 from VOREStation/upstream-merge-7925
[MIRROR] Makes custom cigarettes even more custom-ier
2021-03-19 07:48:42 +00:00
Cadyn 947fe850ff Yummy bugfixes 2020-10-27 19:58:49 -07:00
CerebulonandVirgoBot 7c57c7c0bd Vendor enhancement fixes (#7577)
* Vendor enhancement fixes

* skrellsnax trash, tuna name
2020-08-30 02:49:00 -04:00
Rykka d2fb9a7691 Rebase onto Master for Volume Control Panel, Squash Commits 2020-08-27 19:47:38 -04:00
AtermoneraandVirgoBot 1e9e8c2c60 Flavour Enhancement: Vending 2020-08-20 21:25:31 -04:00
CerebulonandVirgoBot 8b031dd8ad Persistent Trash/Dirt/Graffiti/Notices 2020-07-24 05:24:56 -04:00
Aronai SieyesandVirgoBot 6ebd249748 Rewrite examine() to pass a list around 2020-04-29 16:42:50 -04:00
AtermoneraandVirgoBot 11eed81b92 Ports precision placement of items 2020-02-22 02:35:41 -05:00
Arokha SieyesandLeshana 47ccc655db Deprecate the stream operator 2020-02-12 19:38:43 -05:00
AtermoneraandVirgoBot 9b93339969 Moar descriptions for things 2020-01-20 22:50:39 -05:00
Unknown 0d73c8ad76 Early Polaris Ports
Ports Polaris PRs 6424, 6426, 6428, 6430, 6431, 6432, 6433, and 6434

No vorestation edit markings because they are polariscode ports.
2019-08-30 23:55:58 -04:00
NovacatandGitHub abcde8fe5f Merge pull request #4680 from VOREStation/upstream-merge-5825
[MIRROR] Adds ability to put butts in boxes
2019-03-27 15:19:30 -04:00
NovacatandGitHub 1bbb64494e Merge pull request #4678 from VOREStation/upstream-merge-5835
[MIRROR] Updates Religion Lists + Adds Religious Paraphernalia
2019-03-27 15:19:15 -04:00
AtermoneraandNovacat 131636b1d2 Capitalizes initialize() to Initialize() because Destroy() is capitalized and this is pretty nerve-grinding 2019-03-26 13:21:08 -04:00
AnewbeandVirgoBot 1ea5885504 Merge pull request #5825 from PolarisSS13/butt_boxing
Adds ability to put butts in boxes
2019-01-14 21:23:41 -05:00
NeertiandVirgoBot e1cf31c565 Merge pull request #5835 from Cerebulon/ReligionUpdate
Updates Religion Lists + Adds Religious Paraphernalia
2019-01-14 03:47:00 -05: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
BillyBanglesandAtermonera 6ff1f1b165 fixes #4992 (#4995)
i'm good at this i swear
2018-03-02 18:24:51 -08:00
BillyBanglesandAnewbe 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
AnewbeandGitHub 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
SchnayyandAnewbe 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