Commit Graph

297 Commits

Author SHA1 Message Date
Casey
b9f0c0ef92 Late Night Stuff 2022-04-17 09:21:02 +00:00
Razgriz
100e98e9bc no 2022-03-27 15:17:28 -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
Casey
b721da62a1 A more elegant weapon from a more civlised age 2022-02-27 19:27:52 +00:00
Casey
592777ba9b Merge Fixes for 8222 2022-02-19 22:04:54 +00:00
BlackMajor
6b4ccac9db many more fixes 2021-12-14 02:22:21 +13:00
BlackMajor
dbb5a4083b more progress 2021-12-07 01:46:21 +13:00
Aronai Sieyes
0f2f5cb482 Merge pull request #11615 from VOREStation/upstream-merge-8311
[MIRROR] Remove suicide act
2021-10-28 00:49:05 +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
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
Nadyr
806ec66e59 powder that makes you say yes 2021-08-27 21:09:01 -04:00
Nadyr
b7894c7332 pwoder that makes you say yes 2021-08-27 21:08:38 -04:00
Nadyr
8d54859a25 Merge branch 'master' into upstream-merge-11432 2021-08-27 21:08:12 -04:00
Nadyr
e20ed23ac0 powder that makes you say yes 2021-08-27 20:05:30 -04:00
Nadyr
3287536c76 powder that makes you say yes 2021-08-27 20:05:01 -04:00
Nadyr
072983120b powder that makes you say yes 2021-08-27 20:04:18 -04:00
Chompstation Bot
af0d7a0f6b Make stack amount var private 2021-08-26 15:39:04 +00:00
Nadyr
e4c708ee23 powder that makes you say yes 2021-08-25 23:06:38 -04:00
Novacat
c86c7a526e Upstream-11432 2021-08-24 21:10:58 -07:00
Chompstation Bot
d189c9a12f Crusher Gaming 2021-08-24 23:58:27 +00:00
Nadyr
f201b53fe4 powder that makes you say yes 2021-07-16 18:15:52 -04:00
Chompstation Bot
481c0e314e Convert some bools to TRUE/FALSE instead of 1/0. 2021-07-16 17:44:40 +00:00
Nadyr
48c609ddca Merge pull request #2487 from CHOMPStationBot/upstream-merge-10988
[MIRROR] Fixes #10885
2021-07-10 01:38:31 -04:00
Aronai Sieyes
c495e183a8 Merge pull request #10988 from MarinaGryphon/issue/10885
Fixes #10885
2021-07-09 16:18:08 +00:00
Chompstation Bot
287a5deee3 Use material defines more 2021-07-07 19:02:05 +00:00
Aronai Sieyes
5e675845de Merge pull request #10789 from VOREStation/Arokha/eriskitchen
Port Bay microwave, utensil/kitchen knife sprites
2021-07-04 00:38:10 +00:00
Chompstation Bot
c97b47de72 [MIRROR] Halves Item Slowdown Effects 2021-06-28 11:32:00 +00:00
Razgriz
45c9f96537 POWDER THAT MAKES YOU SAY YW 2021-06-24 18:46:26 -07:00
Chompstation Bot
fb343cec6c [MIRROR] Linter diagnostics + bans non-var relative pathing 2021-06-22 22:17:02 +00:00
Novacat
571025d718 Merge pull request #10694 from VOREStation/upstream-merge-8140
[MIRROR] Refactors utensils to use weakrefs
2021-06-19 13:44:00 +00:00
Chompstation Bot
55e3dc7904 Port current /tg/ lighting system 2021-06-18 04:23:09 +00:00
Aronai Sieyes
4edcaa7908 Merge pull request #10611 from VOREStation/upstream-merge-8123
[MIRROR] stops armour plate and armour plate inserts having the same name, and…
2021-06-11 19:22:01 +00:00
Chompstation Bot
20e3b0a2d3 [MIRROR] Linter Introduction + Cleanup 2021-05-27 16:31:50 +00:00
Chompstation Bot
55cb88b4a9 [MIRROR] Ported the Bay/Nebula emote system. 2021-05-05 18:45:31 +00:00
Nadyr
e98859942f Merge branch 'master' into upstream-merge-9974 2021-03-26 03:57:31 -04:00
Chompstation Bot
2a5c21c8f5 [MIRROR] Kaleidoscope 2: The Retabbening 2021-03-21 01:24:14 -04:00
Chompstation Bot
2915e36ee8 [MIRROR] Tachikoma tweaks. 2021-03-19 09:44:42 +00:00
Chompstation Bot
598a7814e8 [MIRROR] Adds a modular armour version of the explorer suit and adds sprites to specialist armour 2021-03-09 20:17:06 +00:00
Chompstation Bot
ad57e1ad13 [MIRROR] Sideports a couple of init unit tests from Neb. 2021-02-27 18:45:36 +00:00
Novacat
9e5a5c4c46 Merge pull request #9738 from VOREStation/twologfix
Two fixes for messages I noticed in logs
2021-02-17 15:40:52 +00:00
Novacat
5211edc9c0 Merge pull request #9573 from VOREStation/upstream-merge-7786
[MIRROR] Gadgets & Gizmos
2021-01-24 06:55:05 +00:00
Sharkmare
69d2fa3387 Fixing typo 2021-01-09 01:35:46 +01:00
Sharkmare
0e22771046 Fixing WHIP
Adds placeholder whip sprite for the whip, since virgo doesnt have it, we dont have it and by god im not looking for if it even existed or when.
2021-01-09 01:27:52 +01:00
Novacat
7e16cd134a Merge pull request #9527 from VOREStation/upstream-merge-7780
[MIRROR] Adds a Whip.
2020-12-28 17:12:39 +00:00
Razgriz
f0ace37d4f Spear and Gun sizes
-Made all gun and spear sizes larger so that they will no longer fit into backpacks.
--Energy spears and energy swords will fit while deactivated, but not while active (unchanged)

-Tweaked the Floragun have no recoil for micros.
2020-11-23 19:29:48 -07:00
Verkister
16a23eadec Merge pull request #9235 from VOREStation/upstream-merge-7726
[MIRROR] Fix most borosilicate shards disappearing instantly after being made
2020-10-19 10:37:24 +00:00
Cadyn
07775449d7 Fixing conflicts 2020-10-05 18:10:53 -07:00
ShadowLarkens
3d7b051f2b Convert /material to /datum/material 2020-09-27 16:16:44 -07:00
Razgriz
54e632ebf2 September 2020 Upstream Merge 2020-09-25 23:07:08 -07:00
izac112
4b051c23fc Merge branch 'release' of https://github.com/VOREStation/VOREStation into izac 2020-09-13 15:05:53 +02:00