Commit Graph

1063 Commits

Author SHA1 Message Date
Verkister
88f23977a6 Fixes gender chem kits
Un-oopsie-poopsied the funny chemnames that runtimed and bricked the whole kits
2023-01-03 18:46:46 +02:00
Novacat
56f0906618 Merge pull request #14224 from Heroman3003/cream
Gives service borgs some cream
2022-12-22 02:29:42 +00:00
Casey
0ec934b863 Merge pull request #13900 from Cameron653/syringe_overlay
Fixes an oversight with syringes.
2022-10-16 21:04:00 +00:00
Darlantan
06bd861d57 First "let's back up my work somewhere other than my HDD" commit 2022-09-25 17:54:03 -04:00
Razgriz
64a7d9a36d Merge pull request #5010 from CHOMPStation2/upstream-merge-12971
[MIRROR] [MIRROR] Bartending enhancements (ABLE TO BE MERGED)
2022-09-22 22:17:43 -07:00
Razgriz
a6f9014496 powder that makes you say yes 2022-09-22 21:50:36 -07:00
Casey
de491df7b7 Radiation Rework 2022-09-23 00:56:28 +00:00
Casey
b0802ce267 More TGUI Input Conversions 2022-06-19 11:09:42 +00:00
Casey
16b58a8b18 Adds chemistry kits 2022-05-08 09:57:10 +00:00
Razgriz
0ce7af1fd9 Merge pull request #4145 from TheGreatKitsune/hypospray_size
Adjust hypospray size. (Fixes #4097)
2022-04-28 13:52:44 -07:00
Casey
8679260347 Merge pull request #12819 from GhostActual/powder_drugs
Pharma Fix
2022-04-24 07:17:44 +00:00
TheGreatKitsune
084dfb05c4 Adjust hypospray size. 2022-04-23 20:42:11 -05:00
Casey
c9eb919583 Big Pharma's Blessing: Snorting Mechanics 2022-04-17 21:17:05 +00:00
Casey
a6e052cc9b Hypospray Revamp 2022-04-04 18:29:52 -04:00
Razgriz
861646f4b4 no 2022-03-27 15:20:12 -07:00
Casey
61c0ddf399 Makes engraving no-longer cause rage when trying to cut wires, amongst other things. 2022-03-27 19:00:28 +00:00
Razgriz
de4cc762f1 powder that makes you say yes 2022-02-16 14:40:09 -07:00
Casey
fdfa958555 Adds vendor refill cartridges to cargo 2022-02-14 21:36:39 +00:00
Aronai Sieyes
12d8d8f592 Merge pull request #11681 from VOREStation/upstream-merge-8326
[MIRROR] You can't feed drinks to borgs
2021-10-28 01:25:13 +00:00
Chompstation Bot
3caad465fa the part printing buff nobody asked for 2021-10-27 21:05:26 -04:00
Casey
35d62f6ea7 Merge pull request #11582 from PastelPrinceDan/autoinjectors
Adds large autoinjectors to autolathes
2021-09-24 03:55:25 +00: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
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
84d54d6c4e [MIRROR] Chemsprayer Update 2021-07-25 00:27:57 +00:00
Aronai Sieyes
977f422509 Merge pull request #11154 from VOREStation/Arokha/supervial
Supermatter vial
2021-07-19 22:23:52 +00:00
Chompstation Bot
481c0e314e Convert some bools to TRUE/FALSE instead of 1/0. 2021-07-16 17:44:40 +00:00
Chompstation Bot
287a5deee3 Use material defines more 2021-07-07 19:02:05 +00:00
Razgriz
1a3c753f4a Merge pull request #2346 from CHOMPStationBot/upstream-merge-10802
[MIRROR] Port several foods and food sprites
2021-07-03 14:49:34 -07:00
Aronai Sieyes
67e370b0cf Merge pull request #10800 from VOREStation/Icons/chemistry
Swap chemmaster, port beaker sprites
2021-07-03 20:31:14 +00:00
Aronai Sieyes
64db1a458b Merge pull request #10802 from VOREStation/Icons/food
Port several foods and food sprites
2021-07-03 20:31:07 +00:00
Chompstation Bot
b6e1989a01 The One Where I Port Modals 2021-06-30 19:29:34 +00:00
Razgriz
f692192d2c Merge pull request #2276 from CHOMPStationBot/upstream-merge-10727
[MIRROR] Medicine Tweaks
2021-06-26 13:24:46 -07:00
Chompstation Bot
5cbb0e48e0 Medicine Tweaks 2021-06-23 16:35:01 +00:00
Chompstation Bot
fb343cec6c [MIRROR] Linter diagnostics + bans non-var relative pathing 2021-06-22 22:17:02 +00:00
Chompstation Bot
55e3dc7904 Port current /tg/ lighting system 2021-06-18 04:23:09 +00:00
Chompstation Bot
a0e3679020 Adds gender TF chemicals + Spontaneous TF pref 2021-05-30 23:00:43 +00:00
Chompstation Bot
ca996648dd [MIRROR] Oops, I refactored Chemistry! 2021-05-08 23:59:34 -04:00
Chompstation Bot
588179bd66 Remove unnecessary 'signatures' 2021-04-08 16:48:30 +00:00
Chompstation Bot
ad57e1ad13 [MIRROR] Sideports a couple of init unit tests from Neb. 2021-02-27 18:45:36 +00:00
Novacat
6b62269885 Merge pull request #9734 from MarinaGryphon/init_fixes
Fixes init issues in _vr files.
2021-02-16 17:59:00 +00:00
Novacat
e481ed54e5 Merge pull request #9474 from lukevale/master
Adds in Measuring cups, and nickname's to the character load selection.
2020-12-18 19:32:12 +00:00
Razgriz
54755b9e2b Port Feeder from Old Chomp
FEEEEEEED.
2020-11-04 01:31:11 -07:00
Cadyn
07775449d7 Fixing conflicts 2020-10-05 18:10:53 -07:00
Razgriz
54e632ebf2 September 2020 Upstream Merge 2020-09-25 23:07:08 -07:00
Novacat
41c8e4a671 Merge pull request #9032 from VOREStation/upstream-merge-7475
[MIRROR] Hydro upkeep
2020-09-21 19:42:43 -04:00
Atermonera
84b9867fd0 Merge pull request #7669 from Mechoid/FixBeakerdipping
Fix Beaker Dipping
2020-09-21 12:49:38 -04:00
Mechoid
68a37c64fa Hydro upkeep 2020-09-16 19:40:41 -04:00
izac112
4b051c23fc Merge branch 'release' of https://github.com/VOREStation/VOREStation into izac 2020-09-13 15:05:53 +02:00
Novacat
070a3489fe Merge pull request #8940 from VOREStation/upstream-merge-7583
[MIRROR] FBP Internals Additions
2020-09-01 00:51:59 -04:00
Atermonera
a5c829ea53 FBP Internals Additions 2020-08-31 23:25:13 -04:00