Commit Graph

651 Commits

Author SHA1 Message Date
Nadyr
d45c7b7eed Merge branch 'master' into upstream-merge-12767 2022-04-17 23:33:35 -04:00
Casey
c9eb919583 Big Pharma's Blessing: Snorting Mechanics 2022-04-17 21:17:05 +00:00
Casey
abea22deec Merge pull request #12765 from GhostActual/Lettuce-Eat
Lettuce Eat
2022-04-17 17:55:59 +00:00
Casey
61ea8e3f3d New Donk-pockets 2022-04-06 02:12:51 +00:00
Nadyr
8ad19a97dd powder that makes you say yes 2022-03-25 18:47:44 -04:00
Casey
e71a04a991 Merge pull request #12504 from GhostActual/Robs-You-In-Public
Robs You In Public
2022-03-21 20:21:21 +00:00
Razgriz
b01d409de6 Merge pull request #3828 from CHOMPStation2/master
Merge master into 12392
2022-03-11 15:21:48 -07:00
Razgriz
2302b9c597 Merge pull request #3803 from CHOMPStation2/upstream-merge-12388
[MIRROR] Recipe Fixes
2022-03-07 17:01:41 -07:00
Razgriz
2914773316 Revert "Revert "[MIRROR] Fixes #12338"" 2022-03-07 09:11:30 -07:00
Verkister
4ba81c82ed Fixes buns breaking food
Probably. A bad index right here for sure tho.
2022-03-07 17:57:56 +02:00
Casey
5510dbf441 Merge pull request #12392 from Heroman3003/cookiefix
Brings REAL cookies to everywhere they belong
2022-03-07 09:06:24 +00:00
Razgriz
c96d30578b Revert "[MIRROR] Fixes #12338" 2022-03-07 02:02:26 -07:00
Casey
778a42866e Merge pull request #12388 from GhostActual/Recipe-fix
Recipe Fixes
2022-03-07 08:18:44 +00:00
Novacat
d0ea2006cd Merge pull request #12365 from GhostActual/Fix
Fixes #12338
2022-03-04 14:45:39 +00:00
Casey
592777ba9b Merge Fixes for 8222 2022-02-19 22:04:54 +00:00
Test Turtle
270f307b7c Pilk
What it says on the tin.
2022-02-13 00:42:21 -08:00
Casey
de56611efc Merge pull request #12142 from Heroman3003/foodtweak
Minor food tweaks
2022-02-03 06:31:10 +00:00
Nadyr
6aedf42f97 Merge pull request #3335 from CHOMPStation2/upstream-merge-11879
[MIRROR] Minor name change to pineapple ring
2021-12-12 06:05:27 -05:00
Casey
f86e3f2b88 Adds two new particle smasher recipies 2021-12-12 05:52:49 -05:00
Nadyr
8d2e260f17 Merge pull request #3421 from CHOMPStation2/upstream-merge-11807
[MIRROR] Adds general-purpose cooking oil, replaces usages of corn oil
2021-12-12 03:23:06 -05:00
Casey
c2441330b6 Adds general-purpose cooking oil, replaces usages of corn oil 2021-12-10 00:20:40 +00:00
Casey
65565f32f6 Merge pull request #11879 from Heroman3003/pineapplering
Minor name change to pineapple ring
2021-12-08 22:48:46 +00:00
Casey
97027f9a07 Merge pull request #11760 from Very-Soft/sortchems
Makes Chem Storage list alphabetical
2021-12-08 04:27:07 +00:00
Nadyr
8e779b4d64 Merge pull request #3221 from CHOMPStation2/upstream-merge-11912
[MIRROR] Simplifies butchering
2021-12-05 13:09:16 -05:00
Nadyr
1e810da2d5 powder that makes you say yes 2021-12-05 11:09:45 -05:00
Casey
12cc72e439 Simplifies butchering 2021-12-03 07:16:04 +00:00
Nadyr
e75b980dfe Merge pull request #3186 from Shadowfire117/master
Arachnid Slammer
2021-11-13 19:57:04 -05:00
Shadow
fc2597de2a Arachnid Slammer
Made a new drink derived from stimulants, energy drink and hearty ale! Good to warm the heart and soul when mining and slaying spiders!

Also made a recipe for making some absolute loko energy drinks!
2021-11-10 17:25:18 +01:00
Chompstation Bot
0851b4f14c Takes Stellar Delight apart 2021-11-01 21:58:31 +00:00
Chompstation Bot
4a5b2182c1 Brainfood 2021-10-27 16:07:14 +00:00
Nadyr
0edc9e806f Merge pull request #3099 from CHOMPStationBot/upstream-merge-11578
[MIRROR] [MIRROR] Misc runtime fixes
2021-10-22 20:42:21 -04:00
Nadyr
3995a66fca Merge branch 'master' into upstream-merge-11579 2021-10-22 20:03:36 -04:00
Nadyr
3796a6a388 Merge pull request #3092 from CHOMPStationBot/upstream-merge-11541
[MIRROR] [MIRROR] A Hint Of Lime
2021-10-22 20:01:18 -04:00
Chompstation Bot
12b909e536 [MIRROR] Misc runtime fixes 2021-10-22 18:57:55 +00:00
Chompstation Bot
ffadbf101f [MIRROR] Stimulant allergen for Tajaran 2021-10-22 18:57:48 +00:00
Chompstation Bot
deae206b41 [MIRROR] A Hint Of Lime 2021-10-22 18:12:11 +00:00
Aronai Sieyes
0f6e69f344 Merge pull request #11533 from VOREStation/upstream-merge-8236
[MIRROR] Allows wiping food off cutlery
2021-10-22 17:52:40 +00:00
Verkister
37fc075835 Fixes microwave disappearing when bloody
Earlyport upstream fix
2021-10-02 14:34:43 +03:00
Chompstation Bot
2d2fa36094 [MIRROR] Fixes stray bugs 2021-09-27 18:46:27 +00:00
Casey
ae13ff1ed2 Merge pull request #11524 from GhostActual/boxed
Boxing Day
2021-09-24 03:21:13 +00:00
Razgriz
70044ce954 Update thecake.dm 2021-09-14 04:16:29 -07:00
Rykka
ed798113d9 Compiler Fixes
Fixes in order:
- Removes List of defines in misc_ch.dm that are no longer used - they're defined here for the casino prize dispenser, making these obsolete:
![](https://i.imgur.com/8iCsb98.png)

- Fixes relative pathing in mecha_parts_ch.dm
- Fixes relative pathing in bodybag.dm
- Fixes relative pathing in sahoc_ch.dm
- Fixes relative pathing in toys_yw.dm
- Fixes def_zone being defined when only the variable was needed in twohanded_ch.dm
- Fixes relative pathing in trash_pile_vr_ch.dm
- Fixes clip_mask being missing in misc_ch.dm
- Fixes relative pathing in tesh_synth_facemask.dm
- Fixes absolute path being indented in by one (typo?)
- Fixes relative pathing in armor_yw.dm
- Fixes unreachable parent call in audible_scream_ch.dm
- Fixes VERM_LIZARDS being undefined when it wasn't defined, as VERM_LIZARDMEN was the variable being defined + used in mutants.dm
- Removes two un-needed parent calls - these procs have no parent on /obj/structure - thecake_ch.dm
- Fixes invalid kword nano_state in protean_blob.dm
- Fixes relative pathing in drone_manufacturer_unify.dm
- Fixes relative pathing in synx.dm
- Removes arguments of drop_item that don't exist (port was from TG and had force_drop = 1 and src defined.) - vox.dm
- Added vision_required = TRUE to fix proc argument missing - bigdragon_ch.dm
- Added include_robo = TRUE to fix argument missing in demon_ch.dm
- Fixes relative pathing in rakshasa_abilities.dm
- Adds comment to solargrub.dm, unable to fix operator overload error yet.
- Fixes relative pathing in sprite_accessories_extra_ch.dm
- Fixes relative pathing in sprite_accessories_yw.dm
- Fixes relative pathing in phase.dm
- Fixes relative pathing in bluespacecoffee.dm
- Fixes relative pathing in other_ch.dm
- Fixes relative pathing and ambigious ! in living_ch.dm
- Fixes relative pathing in custom_clothes_yw.dm
- Fixes relative pathing in custom_rigs_yw.dm
- Fixes relative pathing in MadokaSpear.dm
- Comments out duplicate #includes in southern_cross.dm as vorestation.dme has them #include'd.
2021-09-03 17:22:49 -07:00
Chompstation Bot
af0d7a0f6b Make stack amount var private 2021-08-26 15:39:04 +00:00
Nadyr
c908563dec powder that makes you say yes 2021-08-25 22:28:33 -04:00
Nadyr
5c5591c16e powder that makes you say yes 2021-08-25 22:26:08 -04:00
Aronai Sieyes
72f5e790db Upstream-11421 2021-08-24 21:10:20 -07:00
Nadyr
d3e639eb83 powder that makes you say yes 2021-08-24 20:37:05 -04:00
Novacat
827f9ebbbf Merge pull request #11477 from VOREStation/upstream-merge-8223
[MIRROR] Updates wine reagent id to redwine.
2021-08-24 23:57:24 +00:00
Chompstation Bot
beef8e7f82 Virology Revamp 2021-08-13 15:38:46 +00:00
Aronai Sieyes
eb13ece148 Merge pull request #11356 from VOREStation/Arokha/sipp
Allows sipping proteans/prometheans
2021-08-07 21:33:48 +00:00