Commit Graph

29244 Commits

Author SHA1 Message Date
VerySoft f808da1be9 ACTUALLY updates the preferences
I missed a couple important places.
2022-04-18 17:14:27 -04:00
Casey a1c0ece7a9 Merge pull request #12791 from Very-Soft/adjustprefs
Adjust default prefs
2022-04-18 16:52:30 -04:00
Casey 0955b0c88b Merge pull request #12790 from GhostActual/energen_batteries
re-EnerGen Batteries
2022-04-18 16:47:23 -04:00
Casey 37a6bc85c6 Merge pull request #12781 from FartMaster69420/stumble-vore
Removing Debug Text from Stumble Vore PR
2022-04-18 16:45:25 -04:00
Casey 8be017727c Merge pull request #12775 from GhostActual/random_fixes
New stock part sprites
2022-04-18 16:44:51 -04:00
VerySoft 4c78036d43 Adjust default prefs
Makes it so the stumble/slip/drop vore prefs are on by default, since you have to have the spontaneous vore option enabled for them to work to begin with. 

Also makes both spontaneous vore options off by default for consistency. (And moves the enabling of the pred option to the simple mob file since that's what that was for anyway)
2022-04-18 16:26:29 -04:00
GhostActual d8c9f0fe42 Fix Commit 2022-04-18 15:56:17 -04:00
FartMaster69420 66a195c1ec Removing Debug Text
I'm an idiot and left this in here.
2022-04-17 22:13:23 -04:00
klaasjared c9a689ac71 Base Commit 2022-04-17 19:01:58 -04:00
Casey 592913160c Merge pull request #12604 from VOREStation/upstream-merge-8431
[MIRROR] Allergen CE Conversion
2022-04-17 18:40:34 -04:00
Casey c7c260881c Merge pull request #12763 from KillianKirilenko/kk-feedback
Verb Reset Buttons
2022-04-17 17:39:54 -04:00
Casey e5da139dfd Merge pull request #12770 from Runa-Dacino/posibrain_transcore_notify
Adds transcore ping to brainmobs
2022-04-17 17:17:39 -04:00
Casey e5324f9aa9 Merge pull request #12768 from GhostActual/pocky_stick_fix
Pocky Fix
2022-04-17 17:16:50 -04:00
Casey b042467fe4 Merge pull request #12767 from GhostActual/powder_drugs
Big Pharma's Blessing: Snorting Mechanics
2022-04-17 17:16:33 -04:00
Casey 03b55b548a Merge pull request #12761 from GhostActual/energen_batteries
EnerGen Brand Batteries
2022-04-17 17:16:22 -04:00
Casey eb554c3460 Merge pull request #12766 from GhostActual/Fixes-6-year-old-bug-with-icon-filepaths-being-override-in-update_icon
Fixes 6 year old bug with icon filepaths being override in update_icon
2022-04-17 17:14:44 -04:00
Casey cd3364d9b1 Merge pull request #12725 from liache/Liache-Winged-Flight-Patch
Update station_special_abilities_vr.dm
2022-04-17 17:13:56 -04:00
liache c01c9d78ab Further Overweight Flying Fixes
This removes a stop-flying call if you're too heavy that I missed before, and also updates the text to remove reference to too much weight in the description.
2022-04-17 16:57:17 -04:00
Runa Dacino 565ca139f1 Adds transcore ping to posibrains. 2022-04-17 22:38:18 +02:00
Casey 67b807a9d5 Merge pull request #12765 from GhostActual/Lettuce-Eat
Lettuce Eat
2022-04-17 13:55:01 -04:00
GhostActual 5dcea6ff9d Base Commit 2022-04-17 13:31:31 -04:00
GhostActual 2892390cb3 Base Commit 2022-04-17 13:15:30 -04:00
GhostActual 262318dc24 Update mine_turfs.dm 2022-04-17 12:31:34 -04:00
GhostActual 86ce9c5f5a Base Commit 2022-04-17 12:20:03 -04:00
VerySoft a656c0673d These too 2022-04-17 08:17:28 -04:00
VerySoft fa7d2340e8 blue and yellow 2022-04-17 07:52:19 -04:00
VerySoft 077a07de92 I got you bloo 2022-04-17 07:23:19 -04:00
Casey 4c1de50033 Merge pull request #12758 from ItsSelis/patch-1
No more suit sensors for Primitive/Tribal clothes
2022-04-17 05:27:16 -04:00
Casey 9568619a1d Merge pull request #12749 from Runa-Dacino/schnapsen_final_final
Adds a new playing card game: schnapsen
2022-04-17 05:23:36 -04:00
Casey 018bf18dc5 Merge pull request #12745 from CubeJackal/master
Add eastern dragon taur suit sprites
2022-04-17 05:23:08 -04:00
Casey 6a2e26314e Merge pull request #12739 from GhostActual/late_at_night
Late Night Stuff
2022-04-17 05:20:17 -04:00
Casey 9c96adff7e Merge pull request #12738 from FartMaster69420/stumble-vore
Stumble Vore
2022-04-17 05:19:08 -04:00
Casey a91e034c03 Merge pull request #12686 from GhostActual/gun-revmap-2022
Firearms 2
2022-04-17 05:13:01 -04:00
Killian 29354af314 verb reset buttons 2022-04-17 08:51:25 +01:00
GhostActual 962039bccd Make GLaDOS mad 2022-04-17 01:26:55 -04:00
GhostActual c14b714089 Base Commit 2022-04-17 00:30:32 -04:00
ItsSelis 88dfe4e075 Putting the variable at the right place 2022-04-16 20:33:02 +02:00
ItsSelis dc578157d1 No sensors for Primitive Clothing 2022-04-16 19:41:03 +02:00
FartMaster69420 b3da886943 Adding Prefs
Adds prefs, changes knocking people over to only trigger on lightweight trait havers, and lets the biggest of guts give a big bounce.
2022-04-15 21:20:05 -04:00
Runa Dacino 6601e9cac5 Schnapsen final (#2)
* Creates schnapsen_vr.dm

New card game deck for 2-player Schnapsen!

* Adds Schnapsen to loadout

* fixes tabs and capitalization

Accidentally set tabs to be space, indent of 2. Changed to the expected tab and 8. 

Also renamed file from _VR to _vr

* Adds schnapsen_vr.dm to #include

* Rename schnapsen_vr to schnapsen_vr.dm

* fixes slashes.

* grr webedits. fixed indentation
2022-04-16 02:00:26 +02:00
CubeJackal 673571c90d Add eastern dragon taur suit sprites
Adds the following suit sprites for the eastern dragon taur: common hardsuits (eng, atmos, med, EMT, sec, mining, explo, field med), biosuits (viro, sec, jani, sci, CMO), and the emergency softsuit (orange syndicate spacesuit icon).
2022-04-15 19:11:16 +01:00
GhostActual 1ac8b601a6 Base Commit 2022-04-15 04:19:08 -04:00
FartMaster69420 f0d0c39f46 Removing empty lines 2022-04-14 23:47:05 -04:00
FartMaster69420 8240013f75 Fix
Missed a '/'
2022-04-14 23:46:13 -04:00
FartMaster69420 2c6cc7f146 Flight Vore Toggle
Adding a toggle to enable flight vore
2022-04-14 23:33:25 -04:00
FartMaster69420 7ec163d624 Initial
Initial commit, my lazy ass is only now doing it.
2022-04-14 22:58:52 -04:00
liache 3590fa34cf Update station_special_abilities_vr.dm 2022-04-13 17:24:59 -04:00
Casey cdb1b8f43d Merge pull request #12720 from liache/Liache-PatchGrippers
Update drone_items.dm Magnetic Gripper
2022-04-12 21:40:48 -04:00
liache 82d7e2a758 Update drone_items.dm 2022-04-12 20:58:21 -04:00
CubeJackal 3b597ff680 Adds eastern dragon taur sprite
Three colours, clipping mask included. Enjoy spaghetti.
2022-04-12 18:42:09 +01:00