Commit Graph

28460 Commits

Author SHA1 Message Date
Casey
b251d27f83 Merge pull request #11886 from VOREStation/upstream-merge-8344
[MIRROR] Fixes rocket launcher
2021-11-22 23:29:39 -05:00
Casey
527ad6c735 Merge pull request #11885 from VOREStation/upstream-merge-8343
[MIRROR] Fixes runtime with ducks and turrets
2021-11-22 23:28:59 -05:00
Casey
357a40b8c5 Merge pull request #11883 from Heroman3003/negroni
Makes Bitters inhibit Martini Classic reaction
2021-11-22 23:26:56 -05:00
Casey
dd2963205e Merge pull request #11879 from Heroman3003/pineapplering
Minor name change to pineapple ring
2021-11-22 23:22:00 -05:00
Casey
3584da94e0 Merge pull request #11875 from Heroman3003/synthtrait
Fixes bugs related to organic/synthetic exclusive traits disappearing
2021-11-22 23:19:44 -05:00
Casey
89dbe8aff2 Merge pull request #11874 from Heroman3003/moreroleprefs
Adds prefs for Corgi and Cursed Sword roles
2021-11-22 23:18:49 -05:00
Casey
a4f6cea907 Merge pull request #11872 from VOREStation/upstream-merge-8345
[MIRROR] Fixes simplemobs with 0 init nutrition runtiming
2021-11-22 23:18:18 -05:00
Casey
e4c0956497 Merge pull request #11870 from Heroman3003/corpsefix
Fixes startup issues with corpse equipment
2021-11-22 23:17:43 -05:00
Casey
71761156f6 Merge pull request #11869 from Heroman3003/gatewayaefix
Fixes active edges and other minor startup issues in gateway areas
2021-11-22 23:16:28 -05:00
Casey
7152ee8e34 Merge pull request #11867 from Heroman3003/tablefix
Fixes some table passing bugs
2021-11-22 23:15:17 -05:00
Casey
ddbb557469 Merge pull request #11866 from Heroman3003/aidoorfix
Fixes AI open door command
2021-11-22 23:14:40 -05:00
Casey
45f5238783 Merge pull request #11860 from Heroman3003/morphfix
Fixes disappearing morphs
2021-11-22 23:14:13 -05:00
Atermonera
f3bdc71afb Merge pull request #8344 from Verkister/patch-80
Fixes rocket launcher
2021-11-21 03:04:41 -05:00
Atermonera
9d3ca8bfba Merge pull request #8343 from Verkister/patch-79
Fixes runtime with ducks and turrets
2021-11-21 03:04:33 -05:00
Heroman
38f81c636a Makes Bitters inhibit Martini Classic reaction 2021-11-21 15:33:27 +10:00
Heroman
ce6dc869d6 Minor name change to pineapple ring 2021-11-21 13:57:08 +10:00
Heroman
3d3baeb4f5 Fixes bugs related to organic/synthetic exclusive traits disappearing 2021-11-21 13:17:52 +10:00
Heroman
5438a64e64 Adds prefs for Corgi and Cursed Sword roles 2021-11-21 12:42:53 +10:00
Atermonera
24cfc9caca Merge pull request #8345 from Verkister/patch-81
Fixes simplemobs with 0 init nutrition runtiming
2021-11-20 19:31:13 -05:00
Heroman
908de5dfa9 Fixes startup runtimes with corpse equipment 2021-11-21 09:56:00 +10:00
Heroman
03e4f17dcc Fixes active edges in gateway areas 2021-11-21 09:07:38 +10:00
Heroman
d4040fe13b Fixes some table passing bugs 2021-11-21 08:40:21 +10:00
Heroman
0514e0778f Fixes AI open door command 2021-11-21 07:53:10 +10:00
Casey
dead3acae1 Merge pull request #11841 from FartMaster69420/somatoray
Somatoray Modularity
2021-11-20 05:46:43 -05:00
Casey
5a55666c20 Merge pull request #11855 from Heroman3003/donk-smasher
Adds two new particle smasher recipies
2021-11-20 05:42:00 -05:00
Casey
0ad226196a Merge pull request #11864 from Heroman3003/pizzafix2
Fixes pizzaguy and talon uniforms not rolling down properly
2021-11-20 05:40:20 -05:00
Casey
d53516cf01 Merge pull request #11862 from Heroman3003/stairfix3
Fixes #11861
2021-11-20 05:38:44 -05:00
Casey
b333909bd6 Merge pull request #11859 from Heroman3003/aifix
Fixes AI eyes being teleported by QP
2021-11-20 05:37:07 -05:00
Casey
f3777fde2a Merge pull request #11852 from Hatterhat/accelerator-pass-3
yet another PR touching kinetic accelerators
2021-11-20 05:36:41 -05:00
Casey
72241ff3e1 Merge pull request #11849 from Hatterhat/cooler
rig suit cooler button
2021-11-20 05:36:18 -05:00
Heroman
096e76320e Fixes pizzaguy and talon uniforms not rolling down 2021-11-20 19:26:02 +10:00
Heroman
5ca4db9b4b Fixes #11861 2021-11-20 17:55:49 +10:00
Heroman
5f76ab7daf Fixes disappearing morphs 2021-11-20 12:51:43 +10:00
Heroman
49c50a0ec9 Fixes AI eyes being teleported by QP 2021-11-20 12:28:59 +10:00
FartMaster69420
c9095b673d Cleaning code
Derp, left some unreachable code.
2021-11-19 17:34:10 -05:00
FartMaster69420
16bf6be95e Merge branch 'VOREStation:master' into somatoray 2021-11-19 17:00:21 -05:00
Heroman
6be19d3ebd Adds two new particle smasher recipies 2021-11-20 07:42:04 +10:00
Hatterhat
f14ccceb7d bruhhhhhhhhhhh 2021-11-18 22:30:54 -06:00
Hatterhat
a4e998854d repaths i forgor 💀 2021-11-18 16:34:03 -06:00
Casey
33c0506b7e Merge pull request #11824 from Heroman3003/facility-type
Adds facility_type map var for the announcement messages
2021-11-18 16:40:59 -05:00
Casey
ee09654ee8 Merge pull request #11850 from Verkister/patch-99
Makes mob renaming not exclusive to vore subtype
2021-11-18 16:39:50 -05:00
Casey
f3851e19a3 Merge pull request #11820 from Verkister/patch-98
Adds vorepanel save doublecheck for non-slot chars
2021-11-18 16:38:20 -05:00
Casey
b6b3f8bb08 Merge pull request #11807 from Heroman3003/oily
Adds general-purpose cooking oil, replaces usages of corn oil
2021-11-18 16:38:05 -05:00
Verkister
1c7825b553 Adds a var toggle to allow multiple name changes 2021-11-18 16:18:26 +02:00
Verkister
18069ef4bc Update vore.dm 2021-11-18 16:15:17 +02:00
Verkister
c8ecd7a8c1 Makes mob renaming not exclusive to vore subtype
Only a fraction of voremobs are actually vore subtype and the verbs can be just as useful for even non-voremobs.
2021-11-18 16:11:54 +02:00
Hatterhat
8b05c6cc15 bruh 2021-11-18 00:48:21 -06:00
Casey
4924592b91 Update code/modules/vore/eating/vorepanel_vr.dm
Co-authored-by: Aronai Sieyes <arokha@arokha.com>
2021-11-18 01:03:38 -05:00
Casey
a2a14b1c32 Merge pull request #11832 from Hatterhat/pad-booster
mechaport gaming
2021-11-18 00:59:45 -05:00
Anthony Rodriguez
6f5ee57f5e Oh god landmarks and everything else hhhhh 2021-11-17 21:35:14 -08:00