mirror of
https://github.com/VOREStation/VOREStation.git
synced 2026-01-28 18:02:17 +00:00
commitb35e7c18ebMerge:ecae13e5c944b2e7336bAuthor: Casey <a.roaming.shadow@gmail.com> Date: Sun May 1 01:07:43 2022 -0400 Merge pull request #12875 from Very-Soft/gbtimewowie Groundbase Tweaks commitecae13e5c9Merge:0bee143744753ebc8d27Author: Casey <a.roaming.shadow@gmail.com> Date: Sun May 1 01:07:34 2022 -0400 Merge pull request #12874 from Runa-Dacino/IPC_HealBelly Fixes healbelly for synthmorphs draining nutrition forever commit753ebc8d27Author: Runa Dacino <dacinoorder@gmail.com> Date: Sun May 1 06:40:50 2022 +0200 Update bellymodes_datum_vr.dm Fixes healbelly for synthmorphs draining nutrition forever Made a little oopsie that local testing didn't catch. It's a minor bug. Moved nutrition drain to only occur when either limbs are damaged, or there's toxloss to repair. Revert "Fixes healbelly for synthmorphs draining nutrition forever" This reverts commit 950c855936890ce186fb33d35a06139ce83e7b54. commit44b2e7336bAuthor: VerySoft <a.roaming.shadow@gmail.com> Date: Sun May 1 00:54:14 2022 -0400 Groundbase Tweaks Adds MORE noticeboards, swaps the gamatorium and arrivals, fixes access on one windoor, adds a few more rollerbeds commit0bee143744Merge:3f05af8c62a2af92842bAuthor: Casey <a.roaming.shadow@gmail.com> Date: Sat Apr 30 23:32:11 2022 -0400 Merge pull request #12870 from Runa-Dacino/IPC_HealBelly Enables healbelly for synthmorphs as prey commit3f05af8c62Merge:a0c22d757c1567dd25d0Author: Casey <a.roaming.shadow@gmail.com> Date: Sat Apr 30 23:09:42 2022 -0400 Merge pull request #12869 from ItsSelis/dosimeters Dosimeters commita0c22d757cMerge:567b8350b3452f71dc5dAuthor: Casey <a.roaming.shadow@gmail.com> Date: Sat Apr 30 23:09:03 2022 -0400 Merge pull request #12861 from FartMaster69420/stack-patch Fixing Stack Deletion commit567b8350b3Merge:17c0a980879025965fc4Author: Casey <a.roaming.shadow@gmail.com> Date: Sat Apr 30 23:08:02 2022 -0400 Merge pull request #12860 from ItsSelis/selis-patch2 (Rascal's Pass) Tiny additions commit17c0a98087Merge:8a68e2bd536b33681b35Author: Casey <a.roaming.shadow@gmail.com> Date: Sat Apr 30 23:07:50 2022 -0400 Merge pull request #12859 from Runa-Dacino/teshari_succumb_bugfix Fixes species with custom MaxHealth being unable to Succumb to death commit9025965fc4Author: ItsSelis <selis@xynolabs.com> Date: Sat Apr 30 23:34:54 2022 +0200 Fixing Xenobotany Permissions commita2af92842bAuthor: Runa Dacino <dacinoorder@gmail.com> Date: Sat Apr 30 21:03:52 2022 +0200 Enables healbelly for synthmorphs Allows treating of synyhmorph (IPC, FBP) crew using healbellies. Does not allow for treatment of prosthethics if still organic. Tested locally by crowbaring one arm of SSD IPC, welding the other and putting them into healbelly. Damage was slowly removed. Also tested with organic to make sure I didn't break anything. Worked like a charm! commit1567dd25d0Author: ItsSelis <selis@xynolabs.com> Date: Sat Apr 30 18:38:27 2022 +0200 Moving dosimeter to proper file commit69f70e19c2Author: ItsSelis <selis@xynolabs.com> Date: Sat Apr 30 18:01:12 2022 +0200 Dosimeters commitd7121d0836Author: ItsSelis <selis@xynolabs.com> Date: Sat Apr 30 14:33:56 2022 +0200 Defib, Gloves & Masks commit452f71dc5dAuthor: FartMaster69420 <78667902+FartMaster69420@users.noreply.github.com> Date: Thu Apr 28 22:55:25 2022 -0400 Fixing bug Moving checks from a single line into a proc and added a check to prevent zero sheet stacks from merging. commit61a4ecc820Author: ItsSelis <selis@xynolabs.com> Date: Fri Apr 29 02:59:19 2022 +0200 Tiny additions - Added more rollerbeds - Moved medical NIFsofts - Added noticeboard to cargo commit6b33681b35Author: Runa Dacino <dacinoorder@gmail.com> Date: Fri Apr 29 01:27:17 2022 +0200 Adjusts "already dead" message per Heroman's suggestion Is funnier. commit4b8806ff1dAuthor: Runa Dacino <dacinoorder@gmail.com> Date: Fri Apr 29 01:22:02 2022 +0200 Allows succumbing at any point under 0 health Species with custom maxhealth are unable to succumb when in crit under previous implementation. This allows for anyone under 0 health to succumb to death, as long as not already dead. commit8a68e2bd53Merge:ae02fc594535d97be232Author: Casey <a.roaming.shadow@gmail.com> Date: Thu Apr 28 02:22:11 2022 -0400 Merge pull request #12856 from Very-Soft/somequicktweaks Quick GB tweaks commit35d97be232Author: VerySoft <a.roaming.shadow@gmail.com> Date: Thu Apr 28 01:56:27 2022 -0400 Quick GB tweaks commitae02fc5945Merge:be13da115ae03edc1939Author: Casey <a.roaming.shadow@gmail.com> Date: Wed Apr 27 21:37:37 2022 -0400 Merge pull request #12854 from FartMaster69420/span_fixes Fixing disabled, fixing span_vr commite03edc1939Author: FartMaster69420 <78667902+FartMaster69420@users.noreply.github.com> Date: Wed Apr 27 18:36:31 2022 -0400 Fixing disabled, fixing span_vr Some files got disabled, also span_vr was shit. Rewrote it to actually use spans we have. commitbe13da115aMerge:722c2b9a998ebd0590e6Author: Casey <a.roaming.shadow@gmail.com> Date: Wed Apr 27 16:30:57 2022 -0400 Merge pull request #12851 from VOREStation/upstream-merge-8579 [MIRROR] Changeling Menu Now Shows Cost commit722c2b9a99Merge:9821f06b5a6facb75614Author: Casey <a.roaming.shadow@gmail.com> Date: Wed Apr 27 16:30:00 2022 -0400 Merge pull request #12850 from VOREStation/upstream-merge-8580 [MIRROR] Fixes doubled name when deathgasping commit9821f06b5aMerge:779bc6c8e685abb42d2eAuthor: Casey <a.roaming.shadow@gmail.com> Date: Wed Apr 27 16:29:23 2022 -0400 Merge pull request #12849 from VOREStation/upstream-merge-8581 [MIRROR] Befure commit779bc6c8e6Merge:d1f9e6d1c50e6c9f9fe6Author: Casey <a.roaming.shadow@gmail.com> Date: Wed Apr 27 16:27:39 2022 -0400 Merge pull request #12846 from VOREStation/upstream-merge-8577 [MIRROR] Vehicle Runtime Fix commitd1f9e6d1c5Merge:887dca3183972fabb2fcAuthor: Casey <a.roaming.shadow@gmail.com> Date: Wed Apr 27 16:26:57 2022 -0400 Merge pull request #12852 from ItsSelis/selis-patch-1 Public Hand Labelers (Rascal's Pass) commit972fabb2fcAuthor: ItsSelis <selis@xynolabs.com> Date: Wed Apr 27 18:54:30 2022 +0200 More Hand Labelers - Added Hand Labeler to Library - Added Hand Labeler to Tool Storage commit8ebd0590e6Author: Atermonera <atermonera@gmail.com> Date: Tue Apr 26 22:49:52 2022 -0800 Changeling Menu Now Shows Cost commit6facb75614Author: VirgoBot <39653486+VirgoBot@users.noreply.github.com> Date: Wed Apr 27 02:51:20 2022 -0400 Fixes doubled name when deathgasping commit1c844af0a1Author: Atermonera <atermonera@gmail.com> Date: Tue Apr 26 22:50:35 2022 -0800 Merge pull request #8580 from Cerebulon/deathgasp Fixes doubled name when deathgasping commit85abb42d2eAuthor: VirgoBot <39653486+VirgoBot@users.noreply.github.com> Date: Wed Apr 27 02:51:14 2022 -0400 Befure commitae1a470250Author: Atermonera <atermonera@gmail.com> Date: Tue Apr 26 22:50:59 2022 -0800 Merge pull request #8581 from Cerebulon/befure Befure commit0e6c9f9fe6Author: VirgoBot <39653486+VirgoBot@users.noreply.github.com> Date: Wed Apr 27 02:49:49 2022 -0400 Vehicle Runtime Fix commit339034ffdcAuthor: Atermonera <atermonera@gmail.com> Date: Tue Apr 26 22:49:32 2022 -0800 Merge pull request #8577 from Sypsoti/vehicleruntimes Vehicle Runtime Fix commit887dca3183Merge:6aa6c4562090f56a7ce2Author: Casey <a.roaming.shadow@gmail.com> Date: Tue Apr 26 18:00:39 2022 -0400 Merge pull request #12843 from Heroman3003/zaddat-autohiss Adds Zaddat Autohiss trait commit90f56a7ce2Author: Heroman <alesha3000@list.ru> Date: Wed Apr 27 07:45:30 2022 +1000 Fixes a whoopsie commit6aa6c45620Merge:e84f5fcc2713a2ab74d6Author: Casey <a.roaming.shadow@gmail.com> Date: Tue Apr 26 17:23:46 2022 -0400 Merge pull request #12842 from Heroman3003/poi-guarantee Adds PoI loader landmarks commite84f5fcc27Merge:bb172b1b12b63dddfd0eAuthor: Casey <a.roaming.shadow@gmail.com> Date: Tue Apr 26 17:23:29 2022 -0400 Merge pull request #12841 from ItsSelis/selis-patch-1 Washing Disposal Bin washes contents of backpacks commitbb172b1b12Merge:7851070a5c89e8b73affAuthor: Casey <a.roaming.shadow@gmail.com> Date: Tue Apr 26 17:23:01 2022 -0400 Merge pull request #12837 from GhostActual/stock_market Stonks! commit7851070a5cMerge:eab59c1476798beba7efAuthor: Casey <a.roaming.shadow@gmail.com> Date: Tue Apr 26 17:17:19 2022 -0400 Merge pull request #12835 from VOREStation/upstream-merge-8573 [MIRROR] Fixes security duffle sprite commiteab59c1476Merge:ecdaaaa6064d9da59942Author: Casey <a.roaming.shadow@gmail.com> Date: Tue Apr 26 17:15:33 2022 -0400 Merge pull request #12829 from GhostActual/salvage_plus Salvage+ commitecdaaaa606Merge:fb0c1bc5cd1416a041feAuthor: Casey <a.roaming.shadow@gmail.com> Date: Tue Apr 26 17:15:04 2022 -0400 Merge pull request #12816 from VOREStation/upstream-merge-8570 [MIRROR] Fixes ALL random tech components having a chance of being anomalous commitfb0c1bc5cdMerge:04ab25c3bf53621417b8Author: Casey <a.roaming.shadow@gmail.com> Date: Tue Apr 26 17:13:23 2022 -0400 Merge pull request #12802 from VOREStation/upstream-merge-8409 [MIRROR] HE pipe turf interaction commit04ab25c3bfMerge:ec3e0971a8f2b9189bf1Author: Casey <a.roaming.shadow@gmail.com> Date: Tue Apr 26 17:12:22 2022 -0400 Merge pull request #12810 from ItsSelis/circuit-update Circuitry Update commitf2351e4bd0Author: Heroman <alesha3000@list.ru> Date: Wed Apr 27 07:06:56 2022 +1000 Adds Zaddat Autohiss trait commitec3e0971a8Merge:41741010cba328d26d2bAuthor: Casey <a.roaming.shadow@gmail.com> Date: Tue Apr 26 16:50:08 2022 -0400 Merge pull request #12655 from VOREStation/upstream-merge-8463 [MIRROR] Ports Vaurca autohiss from Aurora to Zaddat commit41741010cbMerge:50fa5842aec9fc0acaedAuthor: Casey <a.roaming.shadow@gmail.com> Date: Tue Apr 26 16:47:42 2022 -0400 Merge pull request #12583 from VOREStation/upstream-merge-8468 [MIRROR] Fixes catwalks making footsteps on everything commit50fa5842aeMerge:3fa5311a7c788be364a6Author: Casey <a.roaming.shadow@gmail.com> Date: Tue Apr 26 16:46:54 2022 -0400 Merge pull request #12572 from Rykka-Stormheart/shep-dev-trait-name-fixy Upstream port of Trait Reorganization, only touches 3 traits commit3fa5311a7cMerge:b7b3ae73e09ea925d206Author: Casey <a.roaming.shadow@gmail.com> Date: Tue Apr 26 16:46:02 2022 -0400 Merge pull request #12568 from Rykka-Stormheart/shep-dev-scanner-fixy Fixes the Xenochimera Details not being their own line commit13a2ab74d6Author: Heroman <alesha3000@list.ru> Date: Wed Apr 27 06:31:33 2022 +1000 Removes unused var commit7055241d62Author: Heroman <alesha3000@list.ru> Date: Wed Apr 27 06:29:30 2022 +1000 Tries to shut up linter commit2e62949e99Author: Heroman <alesha3000@list.ru> Date: Wed Apr 27 06:07:04 2022 +1000 Adds PoI loader landmarks commitb63dddfd0eAuthor: ItsSelis <selis@xynolabs.com> Date: Tue Apr 26 18:22:25 2022 +0200 Proper washing commitb7b3ae73e0Merge:0616a87890d60c578b8eAuthor: Casey <a.roaming.shadow@gmail.com> Date: Tue Apr 26 05:17:37 2022 -0400 Merge pull request #12838 from Very-Soft/gbwilds Wild! commitd60c578b8eAuthor: VerySoft <a.roaming.shadow@gmail.com> Date: Tue Apr 26 04:02:41 2022 -0400 Wild! More village POIs and a couple GB fixes commit89e8b73affAuthor: GhostActual <evening.quill103@gmail.com> Date: Tue Apr 26 01:28:23 2022 -0400 Fix commit3798f3e32aAuthor: GhostActual <evening.quill103@gmail.com> Date: Tue Apr 26 01:04:47 2022 -0400 Fixes commit4d9da59942Author: GhostActual <evening.quill103@gmail.com> Date: Tue Apr 26 00:58:30 2022 -0400 Update salvageable.dmi commit49208b55ccAuthor: GhostActual <evening.quill103@gmail.com> Date: Tue Apr 26 00:51:24 2022 -0400 Fixes commit821c8d0cacAuthor: GhostActual <evening.quill103@gmail.com> Date: Tue Apr 26 00:48:18 2022 -0400 Final Commit commitce4bec434eAuthor: GhostActual <evening.quill103@gmail.com> Date: Mon Apr 25 22:02:26 2022 -0400 Secondary Commit commitbc32e9a0fcAuthor: GhostActual <evening.quill103@gmail.com> Date: Sun Apr 24 23:18:30 2022 -0400 Console Update computer.dmi Update computer.dmi commit798beba7efAuthor: Atermonera <atermonera@gmail.com> Date: Sun Apr 24 21:50:01 2022 -0800 Fixes security duffle sprite commitda2431f432Author: GhostActual <evening.quill103@gmail.com> Date: Sun Apr 24 23:37:45 2022 -0400 Update salvageable.dmi commit11dadacb63Author: GhostActual <evening.quill103@gmail.com> Date: Sun Apr 24 22:32:53 2022 -0400 Base Commit commit0616a87890Merge:b1b404d5232ba9b1ef8fAuthor: Casey <a.roaming.shadow@gmail.com> Date: Sun Apr 24 21:02:52 2022 -0400 Merge pull request #12823 from Very-Soft/gbwilds Wild! commit2ba9b1ef8fAuthor: VerySoft <a.roaming.shadow@gmail.com> Date: Sun Apr 24 20:52:45 2022 -0400 Yeah! commitb1b404d523Merge:ea8767a53ce0199775a4Author: Novacat <35587478+Novacat@users.noreply.github.com> Date: Sun Apr 24 19:33:04 2022 -0400 Merge pull request #12821 from Very-Soft/solartweak Solar Tweak! commite0199775a4Author: VerySoft <a.roaming.shadow@gmail.com> Date: Sun Apr 24 19:20:05 2022 -0400 pls commit0d5df4b790Author: VerySoft <a.roaming.shadow@gmail.com> Date: Sun Apr 24 19:19:16 2022 -0400 Okay commit050aca7483Author: VerySoft <a.roaming.shadow@gmail.com> Date: Sun Apr 24 18:27:48 2022 -0400 Solar Tweak! Makes the max distance a var instead of a define, that way it can be different depending on the situation. It defaults to 40, so the default behavior is maintained. commitbf254e134bAuthor: VerySoft <a.roaming.shadow@gmail.com> Date: Sun Apr 24 18:24:32 2022 -0400 New and delicious commitf2b9189bf1Merge:ef78ad3606ea8767a53cAuthor: Selis <selis@buckicompany.com> Date: Sun Apr 24 21:10:08 2022 +0200 Merge branch 'VOREStation:master' into circuit-update commitef78ad3606Author: ItsSelis <selis@xynolabs.com> Date: Sun Apr 24 20:50:25 2022 +0200 Power Output Fix commitf3af1a6c41Author: ItsSelis <selis@xynolabs.com> Date: Sun Apr 24 19:58:01 2022 +0200 First Forbidden Circuit - Adds EPv2 Address Discoverer - Adds Forbidden EPv2 Circuit Sprite - Adds Circuit Printer variations for the "Game Panel > Create Object" function & Mapping - Fixes bug of returning lost cell energy - Fixes tiny spelling mistake commitea8767a53cMerge:d0bb7f2c5909c4f357daAuthor: Casey <a.roaming.shadow@gmail.com> Date: Sun Apr 24 03:16:36 2022 -0400 Merge pull request #12819 from GhostActual/powder_drugs Pharma Fix commitd0bb7f2c59Merge:ae6ecf6fb412b9c6369eAuthor: Casey <a.roaming.shadow@gmail.com> Date: Sun Apr 24 03:16:20 2022 -0400 Merge pull request #12820 from Heroman3003/slow_sizegun Adds gradual sizegun commit12b9c6369eAuthor: Heroman <alesha3000@list.ru> Date: Sun Apr 24 16:54:51 2022 +1000 Adds missing argument commit383c356312Author: Heroman <alesha3000@list.ru> Date: Sun Apr 24 16:40:42 2022 +1000 Adds gradual sizegun commit09c4f357daAuthor: GhostActual <evening.quill103@gmail.com> Date: Sat Apr 23 23:19:32 2022 -0400 Base Commit commitae6ecf6fb4Merge:b61a400e80f5e97ea3c1Author: Casey <a.roaming.shadow@gmail.com> Date: Sat Apr 23 20:33:14 2022 -0400 Merge pull request #12817 from Very-Soft/gbwilds GBWilds commitf5e97ea3c1Author: VerySoft <a.roaming.shadow@gmail.com> Date: Sat Apr 23 20:25:19 2022 -0400 GBWilds Wild! commit1416a041feAuthor: Sypsoti <98442665+Sypsoti@users.noreply.github.com> Date: Sat Apr 23 15:15:10 2022 -0500 Fixes ALL random tech components having a chance of being anomalous commitb61a400e80Merge:bdaceb4246e92061a56dAuthor: Casey <a.roaming.shadow@gmail.com> Date: Fri Apr 22 18:42:50 2022 -0400 Merge pull request #12814 from Novacat/nova-basicfixes Vision and Phaser Bug Fixes commitbdaceb4246Merge:9dbfaba2da6ab3dcde1aAuthor: Casey <a.roaming.shadow@gmail.com> Date: Fri Apr 22 18:42:27 2022 -0400 Merge pull request #12813 from KillianKirilenko/kk-talon2 Tiny Talon Tweaks commit9dbfaba2daMerge:f13a4e8bd428fb1f3151Author: Casey <a.roaming.shadow@gmail.com> Date: Fri Apr 22 18:41:59 2022 -0400 Merge pull request #12812 from KillianKirilenko/kk-rewind remove workaround chem commitf13a4e8bd4Merge:4f2a2a0259962de226adAuthor: Casey <a.roaming.shadow@gmail.com> Date: Fri Apr 22 18:41:39 2022 -0400 Merge pull request #12811 from Runa-Dacino/schnapsen_icons Adds William Tell pattern for schnapsen commite92061a56dAuthor: Unknown <RedKerensky@Gmail.com> Date: Fri Apr 22 09:41:14 2022 -0400 Vision and Phaser Bug Fixes - Emagging an expedition phaser properly consumes charges on the emag. - Vision NIFSoft now has their overlays back. commit6ab3dcde1aAuthor: Killian <49700375+KillianKirilenko@users.noreply.github.com> Date: Thu Apr 21 23:16:45 2022 +0100 Update talon_v2.dmm commite573a5ade8Author: Killian <49700375+KillianKirilenko@users.noreply.github.com> Date: Thu Apr 21 22:35:23 2022 +0100 Update talon_v2.dmm commit28fb1f3151Author: Killian <49700375+KillianKirilenko@users.noreply.github.com> Date: Thu Apr 21 07:39:33 2022 +0100 remove workaround chem commit962de226adAuthor: Runa Dacino <dacinoorder@gmail.com> Date: Thu Apr 21 01:15:07 2022 +0200 Adds William Tell pattern for schnapsen Adds William Tell playing card pattern for schnapsen Makes schnapsen_vr.dm deck use william tell pattern Adds William Tell card pattern to playing_cards.dmi Minor resprite of french deck with new colours inspired by the William Tell pattern commitaea8c65c77Author: ItsSelis <selis@xynolabs.com> Date: Thu Apr 21 01:35:51 2022 +0200 Beginning of circuitry update - Added Illegal Tech Disk / Illegal Circuitry Category - Added Simple Hash functions - Added (Very) simple encryption is possible thanks to Rot13 - Fixed EPv2 Circuits not having unlimited range anymore commita95b970bd5Merge:e92bd9e61b4f2a2a0259Author: Selis <selis@buckicompany.com> Date: Thu Apr 21 01:02:54 2022 +0200 Merge branch 'VOREStation:master' into circuit-update commit4f2a2a0259Merge:75e069f969964afcc064Author: Casey <a.roaming.shadow@gmail.com> Date: Wed Apr 20 14:08:03 2022 -0400 Merge pull request #12805 from VOREStation/upstream-merge-8557 [MIRROR] New Rollerbeds... Again! commit75e069f969Merge:eaefa331a3f6ca92f699Author: Casey <a.roaming.shadow@gmail.com> Date: Wed Apr 20 05:02:17 2022 -0400 Merge pull request #12799 from lm40/master Fixes bar dispenser lemon juice commiteaefa331a3Merge:cdc3c47a2768e3911514Author: Casey <a.roaming.shadow@gmail.com> Date: Wed Apr 20 04:40:44 2022 -0400 Merge pull request #12807 from Very-Soft/autoresleevememory Fixes an Auto-Resleever issue commitcdc3c47a27Merge:77c3f42621aea8515843Author: Casey <a.roaming.shadow@gmail.com> Date: Wed Apr 20 04:25:27 2022 -0400 Merge pull request #12796 from GhostActual/particle_gun_fix Particle Gun Fix commit77c3f42621Merge:7f0b7494f8078e8765deAuthor: Casey <a.roaming.shadow@gmail.com> Date: Wed Apr 20 04:24:38 2022 -0400 Merge pull request #12797 from Very-Soft/mobexamine Mob Examine commit68e3911514Author: VerySoft <a.roaming.shadow@gmail.com> Date: Wed Apr 20 04:16:41 2022 -0400 Move da mind commit078e8765deAuthor: VerySoft <a.roaming.shadow@gmail.com> Date: Wed Apr 20 04:05:13 2022 -0400 >:C commit964afcc064Author: Atermonera <atermonera@gmail.com> Date: Tue Apr 19 22:07:55 2022 -0800 New Rollerbeds... Again! commit3b1b7747c6Author: VerySoft <a.roaming.shadow@gmail.com> Date: Wed Apr 20 01:31:42 2022 -0400 first step commit53621417b8Author: VirgoBot <39653486+VirgoBot@users.noreply.github.com> Date: Wed Apr 20 01:29:55 2022 -0400 HE pipe turf interaction commitdec7534ed9Author: Felix <58342752+TheLordME@users.noreply.github.com> Date: Wed Apr 20 07:29:09 2022 +0200 HE pipe turf interaction (#8409) * HE pipe turf interaction * Update code/ATMOSPHERICS/pipes/he_pipes.dm Co-authored-by: Spookerton <spkrtn@pm.me> * Update code/ATMOSPHERICS/pipes/he_pipes.dm Co-authored-by: Spookerton <spkrtn@pm.me> Co-authored-by: Spookerton <spkrtn@pm.me> commitaa911e6d33Author: VerySoft <a.roaming.shadow@gmail.com> Date: Tue Apr 19 23:41:00 2022 -0400 Also includes the DME :U commit9c29ef2b50Author: VerySoft <a.roaming.shadow@gmail.com> Date: Tue Apr 19 23:20:46 2022 -0400 Makes sure the AI actually has a working camera nearby commit30ec336fa0Author: VerySoft <a.roaming.shadow@gmail.com> Date: Tue Apr 19 22:43:48 2022 -0400 LETS COMBINE commitf6ca92f699Author: lm40 <lm40@users.noreply.github.com> Date: Tue Apr 19 03:19:29 2022 -0400 Fixes bar dispenser lemon juice commit88e641d165Author: VerySoft <a.roaming.shadow@gmail.com> Date: Tue Apr 19 02:08:57 2022 -0400 Yup! commitc77d689417Author: VerySoft <a.roaming.shadow@gmail.com> Date: Tue Apr 19 00:19:58 2022 -0400 I guess also these things! commit83ea402185Author: VerySoft <a.roaming.shadow@gmail.com> Date: Mon Apr 18 22:10:32 2022 -0400 Mob Examine Introduces the 'Mob Examine' verb, which lives in the right click menu and the IC tab. This verb is functionally identical to regular examine, except: -Mob Examine only works on mobs -Mob Examine will allow you to examine people your character cannot technically 'see', such as in cases where you are in a belly, or in a micro holder, or you are in a locker. They do need to be visible to the turf whatever you are in occupies though, so it's not like you'll be able to xray people through walls, or inside of other people. However, this should enable people who are being held in hands or in tummies to examine the people around whoever is holding them for purposes of checking prefs and descriptions. As a note, I did try to add this on to the basic examine verb to make it more seamless, but how examine gathers its targets is not something I really understand, and the way it works totally fails out before it even gets to the code in the verb, so I can't just tell it to run this proc if they're in a belly or a holder, and I didn't want to break it by changing it. SO! Separate verb. commitaea8515843Author: GhostActual <evening.quill103@gmail.com> Date: Mon Apr 18 19:07:15 2022 -0400 whoops commit9289ea3f68Author: GhostActual <evening.quill103@gmail.com> Date: Mon Apr 18 18:54:50 2022 -0400 Update mob.dmi commit02f076059bAuthor: GhostActual <evening.quill103@gmail.com> Date: Mon Apr 18 18:44:54 2022 -0400 Fix Commit commit2720b90179Author: GhostActual <evening.quill103@gmail.com> Date: Mon Apr 18 18:07:10 2022 -0400 Base Commit commit57a24132a2Author: GhostActual <evening.quill103@gmail.com> Date: Mon Apr 18 17:59:52 2022 -0400 Test commit7f0b7494f8Merge:a1c0ece7a9f808da1be9Author: Casey <a.roaming.shadow@gmail.com> Date: Mon Apr 18 17:57:54 2022 -0400 Merge pull request #12793 from Very-Soft/adjustprefs ACTUALLY updates the preferences commitf808da1be9Author: VerySoft <a.roaming.shadow@gmail.com> Date: Mon Apr 18 17:14:27 2022 -0400 ACTUALLY updates the preferences I missed a couple important places. commita1c0ece7a9Merge:0955b0c88b4c78036d43Author: Casey <a.roaming.shadow@gmail.com> Date: Mon Apr 18 16:52:30 2022 -0400 Merge pull request #12791 from Very-Soft/adjustprefs Adjust default prefs commit0955b0c88bMerge:f6c1c42693d8c9f0fe42Author: Casey <a.roaming.shadow@gmail.com> Date: Mon Apr 18 16:47:23 2022 -0400 Merge pull request #12790 from GhostActual/energen_batteries re-EnerGen Batteries commitf6c1c42693Merge:026760a36b29cdf17c3fAuthor: Casey <a.roaming.shadow@gmail.com> Date: Mon Apr 18 16:47:07 2022 -0400 Merge pull request #12789 from ItsSelis/selis-patch-1 Psych-Med Fix commit026760a36bMerge:37a6bc85c6a0e379747fAuthor: Casey <a.roaming.shadow@gmail.com> Date: Mon Apr 18 16:46:23 2022 -0400 Merge pull request #12784 from VOREStation/upstream-merge-8555 [MIRROR] Adds Map Templates Folder commit37a6bc85c6Merge:8be017727cc78c61cc59Author: Casey <a.roaming.shadow@gmail.com> Date: Mon Apr 18 16:45:25 2022 -0400 Merge pull request #12781 from FartMaster69420/stumble-vore Removing Debug Text from Stumble Vore PR commit8be017727cMerge:bbbb38fdafc9a689ac71Author: Casey <a.roaming.shadow@gmail.com> Date: Mon Apr 18 16:44:51 2022 -0400 Merge pull request #12775 from GhostActual/random_fixes New stock part sprites commit4c78036d43Author: VerySoft <a.roaming.shadow@gmail.com> Date: Mon Apr 18 16:26:29 2022 -0400 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) commitd8c9f0fe42Author: GhostActual <evening.quill103@gmail.com> Date: Mon Apr 18 15:56:17 2022 -0400 Fix Commit commit014179438dAuthor: ItsSelis <selis@xynolabs.com> Date: Mon Apr 18 20:08:48 2022 +0200 Slight update commit95616e0444Merge:d3a5e13e9000d4385798Author: ItsSelis <selis@xynolabs.com> Date: Mon Apr 18 20:05:37 2022 +0200 Merge branch 'stock_market' of https://github.com/GhostActual/VOREStation into stock_market commit00d4385798Merge:7347939c0ebbbb38fdafAuthor: Selis <selis@buckicompany.com> Date: Mon Apr 18 20:05:21 2022 +0200 Merge branch 'VOREStation:master' into stock_market commitd3a5e13e90Merge:c6681b33707347939c0eAuthor: ItsSelis <selis@xynolabs.com> Date: Mon Apr 18 19:57:54 2022 +0200 Merge branch 'stock_market' of https://github.com/GhostActual/VOREStation into stock_market commit29cdf17c3fAuthor: ItsSelis <selis@xynolabs.com> Date: Mon Apr 18 19:36:52 2022 +0200 Psych-Med Fix commitc78c61cc59Author: FartMaster69420 <78667902+FartMaster69420@users.noreply.github.com> Date: Sun Apr 17 23:28:39 2022 -0400 Reenables stack_vr.dm How does this keep getting disabled >:( commita0e379747fAuthor: Atermonera <atermonera@gmail.com> Date: Sun Apr 17 19:12:45 2022 -0800 Adds Map Templates Folder commit66a195c1ecAuthor: FartMaster69420 <78667902+FartMaster69420@users.noreply.github.com> Date: Sun Apr 17 22:13:23 2022 -0400 Removing Debug Text I'm an idiot and left this in here. commitbbbb38fdafMerge:4cad05e16e9cb54630ecAuthor: Casey <a.roaming.shadow@gmail.com> Date: Sun Apr 17 21:16:32 2022 -0400 Merge pull request #12778 from Very-Soft/wowlessgreen Make meson vision less angry green commit4cad05e16eMerge:592913160c4fabb663aeAuthor: Casey <a.roaming.shadow@gmail.com> Date: Sun Apr 17 21:08:35 2022 -0400 Merge pull request #12777 from Novacat/nova-basicfixes Makes Vision Overlays Not Painful commit9cb54630ecAuthor: VerySoft <a.roaming.shadow@gmail.com> Date: Sun Apr 17 21:06:51 2022 -0400 Dithering commit4fabb663aeAuthor: Unknown <RedKerensky@Gmail.com> Date: Sun Apr 17 20:58:04 2022 -0400 Thirty seems to be a better number commit6304e973b0Author: VerySoft <a.roaming.shadow@gmail.com> Date: Sun Apr 17 20:50:19 2022 -0400 Make meson vision less angry green commit05632bc0eaAuthor: Unknown <RedKerensky@Gmail.com> Date: Sun Apr 17 20:47:51 2022 -0400 Forgot to reset the dmi commit7347939c0eAuthor: ItsSelis <selis@xynolabs.com> Date: Mon Apr 11 23:13:50 2022 +0200 More TGUI (And UI in general) commitdab8cca168Author: ItsSelis <selis@xynolabs.com> Date: Mon Apr 11 19:40:22 2022 +0200 Added TGUI to Stock Exchange First simple version of handling some data. Responding to acts of button presses and some other things still have to be done. commita945c17364Author: GhostActual <evening.quill103@gmail.com> Date: Wed Mar 23 02:17:48 2022 -0400 Base Commit commitc9a689ac71Author: klaasjared <86997650+GhostActual@users.noreply.github.com> Date: Sun Apr 17 19:01:58 2022 -0400 Base Commit commit592913160cMerge:a164f543ec99c2598c96Author: Casey <a.roaming.shadow@gmail.com> Date: Sun Apr 17 18:40:34 2022 -0400 Merge pull request #12604 from VOREStation/upstream-merge-8431 [MIRROR] Allergen CE Conversion commita164f543ecMerge:bff0d96577c25715bb03Author: Casey <a.roaming.shadow@gmail.com> Date: Sun Apr 17 17:53:27 2022 -0400 Merge pull request #12772 from Very-Soft/backtosd Back to SD commitbff0d96577Merge:c7c260881cfa58fc39f5Author: Casey <a.roaming.shadow@gmail.com> Date: Sun Apr 17 17:53:15 2022 -0400 Merge pull request #12771 from Very-Soft/wow! Account for future atmos issues commitc7c260881cMerge:6c663a428329354af314Author: Casey <a.roaming.shadow@gmail.com> Date: Sun Apr 17 17:39:54 2022 -0400 Merge pull request #12763 from KillianKirilenko/kk-feedback Verb Reset Buttons commitc25715bb03Author: VerySoft <a.roaming.shadow@gmail.com> Date: Sun Apr 17 17:39:17 2022 -0400 Back to SD commitfa58fc39f5Author: VerySoft <a.roaming.shadow@gmail.com> Date: Sun Apr 17 17:38:05 2022 -0400 Account for future atmos issues Adds pressure regulating things to all the resleeving areas with disposal outlets. commit6c663a4283Merge:e5da139dfda4ce88a189Author: Casey <a.roaming.shadow@gmail.com> Date: Sun Apr 17 17:18:34 2022 -0400 Merge pull request #12750 from GhostActual/papershredder-and-space-heater-revive Pappershredder/Space Heater Revive commite5da139dfdMerge:e5324f9aa9565ca139f1Author: Casey <a.roaming.shadow@gmail.com> Date: Sun Apr 17 17:17:39 2022 -0400 Merge pull request #12770 from Runa-Dacino/posibrain_transcore_notify Adds transcore ping to brainmobs commite5324f9aa9Merge:b042467fe45dcea6ff9dAuthor: Casey <a.roaming.shadow@gmail.com> Date: Sun Apr 17 17:16:50 2022 -0400 Merge pull request #12768 from GhostActual/pocky_stick_fix Pocky Fix commitb042467fe4Merge:03b55b548a2892390cb3Author: Casey <a.roaming.shadow@gmail.com> Date: Sun Apr 17 17:16:33 2022 -0400 Merge pull request #12767 from GhostActual/powder_drugs Big Pharma's Blessing: Snorting Mechanics commit03b55b548aMerge:eb554c34609cdd3560e0Author: Casey <a.roaming.shadow@gmail.com> Date: Sun Apr 17 17:16:22 2022 -0400 Merge pull request #12761 from GhostActual/energen_batteries EnerGen Brand Batteries commiteb554c3460Merge:cd3364d9b1262318dc24Author: Casey <a.roaming.shadow@gmail.com> Date: Sun Apr 17 17:14:44 2022 -0400 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 commitcd3364d9b1Merge:67b807a9d5c01c9d78abAuthor: Casey <a.roaming.shadow@gmail.com> Date: Sun Apr 17 17:13:56 2022 -0400 Merge pull request #12725 from liache/Liache-Winged-Flight-Patch Update station_special_abilities_vr.dm commitc01c9d78abAuthor: liache <76535603+liache@users.noreply.github.com> Date: Sun Apr 17 16:57:17 2022 -0400 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. commit565ca139f1Author: Runa Dacino <dacinoorder@gmail.com> Date: Sun Apr 17 22:38:18 2022 +0200 Adds transcore ping to posibrains. commit67b807a9d5Merge:76e61a485c86ce9c5f5aAuthor: Casey <a.roaming.shadow@gmail.com> Date: Sun Apr 17 13:55:01 2022 -0400 Merge pull request #12765 from GhostActual/Lettuce-Eat Lettuce Eat commit76e61a485cMerge:04608cf77ca656c0673dAuthor: Casey <a.roaming.shadow@gmail.com> Date: Sun Apr 17 13:51:59 2022 -0400 Merge pull request #12764 from Very-Soft/timeforblue Adds a disposal bin that washes clothes and other oddities commit5dcea6ff9dAuthor: GhostActual <evening.quill103@gmail.com> Date: Sun Apr 17 13:31:31 2022 -0400 Base Commit commit2892390cb3Author: GhostActual <evening.quill103@gmail.com> Date: Sun Apr 17 13:15:30 2022 -0400 Base Commit commit262318dc24Author: GhostActual <evening.quill103@gmail.com> Date: Sun Apr 17 12:31:34 2022 -0400 Update mine_turfs.dm commit86ce9c5f5aAuthor: GhostActual <evening.quill103@gmail.com> Date: Sun Apr 17 12:20:03 2022 -0400 Base Commit commit9cdd3560e0Author: GhostActual <evening.quill103@gmail.com> Date: Sun Apr 17 11:21:59 2022 -0400 Update power_cells.dmi commita656c0673dAuthor: VerySoft <a.roaming.shadow@gmail.com> Date: Sun Apr 17 08:17:28 2022 -0400 These too commitfa7d2340e8Author: VerySoft <a.roaming.shadow@gmail.com> Date: Sun Apr 17 07:52:19 2022 -0400 blue and yellow commit077a07de92Author: VerySoft <a.roaming.shadow@gmail.com> Date: Sun Apr 17 07:23:19 2022 -0400 I got you bloo commit04608cf77cMerge:4011cd3bbfc98cc41bceAuthor: Casey <a.roaming.shadow@gmail.com> Date: Sun Apr 17 05:32:25 2022 -0400 Merge pull request #12760 from Rykka-Stormheart/shep-dev-guides-update Adds Multiple Originally Discord-Only Guides to our Repository. commit4011cd3bbfMerge:1ee881cead5300a20673Author: Casey <a.roaming.shadow@gmail.com> Date: Sun Apr 17 05:31:28 2022 -0400 Merge pull request #12762 from Rykka-Stormheart/shep-dev-mapping-templates-and-guides Adds Map Templates Folder commit1ee881ceadMerge:4c1de50033d810b4765eAuthor: Casey <a.roaming.shadow@gmail.com> Date: Sun Apr 17 05:27:27 2022 -0400 Merge pull request #12759 from Heroman3003/maint-hallway Fixes areas on tether asteroid commit4c1de50033Merge:cbf0ffffd688dfe4e075Author: Casey <a.roaming.shadow@gmail.com> Date: Sun Apr 17 05:27:16 2022 -0400 Merge pull request #12758 from ItsSelis/patch-1 No more suit sensors for Primitive/Tribal clothes commitcbf0ffffd6Merge:9568619a1d5a17117e80Author: Casey <a.roaming.shadow@gmail.com> Date: Sun Apr 17 05:26:31 2022 -0400 Merge pull request #12755 from BonniePandora/Painting-QoL Un-infuriates the funny paint-holder thing. commit9568619a1dMerge:018bf18dc56601e9cac5Author: Casey <a.roaming.shadow@gmail.com> Date: Sun Apr 17 05:23:36 2022 -0400 Merge pull request #12749 from Runa-Dacino/schnapsen_final_final Adds a new playing card game: schnapsen commit018bf18dc5Merge:f71faecb70673571c90dAuthor: Casey <a.roaming.shadow@gmail.com> Date: Sun Apr 17 05:23:08 2022 -0400 Merge pull request #12745 from CubeJackal/master Add eastern dragon taur suit sprites commitf71faecb70Merge:6a2e26314e94e166cbbaAuthor: Casey <a.roaming.shadow@gmail.com> Date: Sun Apr 17 05:21:12 2022 -0400 Merge pull request #12740 from VOREStation/upstream-merge-8535 [MIRROR] Dress Shirt Undershirts commit6a2e26314eMerge:9c96adff7e17ec144b1bAuthor: Casey <a.roaming.shadow@gmail.com> Date: Sun Apr 17 05:20:17 2022 -0400 Merge pull request #12739 from GhostActual/late_at_night Late Night Stuff commit9c96adff7eMerge:88b05350f3b3da886943Author: Casey <a.roaming.shadow@gmail.com> Date: Sun Apr 17 05:19:08 2022 -0400 Merge pull request #12738 from FartMaster69420/stumble-vore Stumble Vore commit88b05350f3Merge:29fa791c5d77e1963bb4Author: Casey <a.roaming.shadow@gmail.com> Date: Sun Apr 17 05:15:40 2022 -0400 Merge pull request #12736 from GhostActual/random_fixes New PCUs commit29fa791c5dMerge:196bd27e6bd7abb2e81eAuthor: Casey <a.roaming.shadow@gmail.com> Date: Sun Apr 17 05:15:09 2022 -0400 Merge pull request #12727 from FartMaster69420/sheet-storage-fixes Stack Stacking: Restacked commit196bd27e6bMerge:a91e034c03b1adccfb66Author: Casey <a.roaming.shadow@gmail.com> Date: Sun Apr 17 05:14:37 2022 -0400 Merge pull request #12735 from GhostActual/newscaster New Newscaster commita91e034c03Merge:c5ebd5a05310bcc21ce3Author: Casey <a.roaming.shadow@gmail.com> Date: Sun Apr 17 05:13:01 2022 -0400 Merge pull request #12686 from GhostActual/gun-revmap-2022 Firearms 2 commitc5ebd5a053Merge:ae43251a9d7660cd1463Author: Casey <a.roaming.shadow@gmail.com> Date: Sun Apr 17 05:12:21 2022 -0400 Merge pull request #12724 from FartMaster69420/biogen Full Stack Algea commitae43251a9dMerge:f8d710d75abc85d8eac4Author: Casey <a.roaming.shadow@gmail.com> Date: Sun Apr 17 05:11:27 2022 -0400 Merge pull request #12718 from FartMaster69420/span Ports Span Macros from TG Station commitf8d710d75aMerge:cdb1b8f43d91514639feAuthor: Casey <a.roaming.shadow@gmail.com> Date: Sun Apr 17 05:10:56 2022 -0400 Merge pull request #12722 from Very-Soft/groundbase Little GB thing commit29354af314Author: Killian <49700375+KillianKirilenko@users.noreply.github.com> Date: Sun Apr 17 08:51:25 2022 +0100 verb reset buttons commit962039bccdAuthor: GhostActual <evening.quill103@gmail.com> Date: Sun Apr 17 01:26:55 2022 -0400 Make GLaDOS mad commitef25f0e0f5Author: GhostActual <evening.quill103@gmail.com> Date: Sun Apr 17 01:22:45 2022 -0400 a Very Soft addition commit5300a20673Author: Rykka <sorren15@gmail.com> Date: Sat Apr 16 22:34:33 2022 -0600 Updates Event Manager to Game Master, to account for staff hierarchy. commit260d0316d5Author: Rykka <sorren15@gmail.com> Date: Sat Apr 16 20:54:13 2022 -0600 Adds Map Templates Folder This folder exists to allow Event Management staff to publicly post event files, or for users to contribute them for use by EMs later, as well as a place to point new contributors towards - for instance, the Complete Room Checklist.dmm has everything a maintainer will check is needed for a room. Templates is for any sort of template an EM or other staff might use on the fly that is not necessarily related to events. Refer to (and update) the readme.md if any of this changes. commitc98cc41bceAuthor: Rykka <sorren15@gmail.com> Date: Sat Apr 16 22:31:45 2022 -0600 Adds Multiple Originally Discord-Only Guides to our Repository. Self-Explanatory. Direct newer contributors towards these. These should help with contributors being able to review these publicly. Guide to Contribution and Wiki Pages to follow once the author has time to do so, or alternatively, someone can beat them to it and do it. A good reference for such would be TGMC's Guide to Contributing (Written for very, very new folks, and a gold standard for walkthroughs.) Additionally, this updates the workspace recommendations, to include the following: Auto Comment Blocks Gitlens (For Gitblaming/seeing last-changed inside files) Indent Rainbow (Easier viewing of indents) DarkPurple-Black (Personal Recommendation, Colors the Terminal Errors tab well) ESLint (Support for ESLint Javascript in VSC) Editor Config for VSCode TGStation Test Adapter (Allows you to run Unit Tests, whenever I actually fix these to work locally) Discord Rich Presence (Not Required, but nice to have.) commitc14b714089Author: GhostActual <evening.quill103@gmail.com> Date: Sun Apr 17 00:30:32 2022 -0400 Base Commit commitd810b4765eAuthor: Heroman <alesha3000@list.ru> Date: Sun Apr 17 10:57:58 2022 +1000 Fixes areas on tether asteroid commit88dfe4e075Author: ItsSelis <selis@xynolabs.com> Date: Sat Apr 16 20:33:02 2022 +0200 Putting the variable at the right place commitdc578157d1Author: ItsSelis <selis@xynolabs.com> Date: Sat Apr 16 19:41:03 2022 +0200 No sensors for Primitive Clothing commit5a17117e80Author: Pandora <pancake_29@live.co.uk> Date: Sat Apr 16 17:01:42 2022 +0100 Add files via upload commita4ce88a189Author: GhostActual <evening.quill103@gmail.com> Date: Sat Apr 16 01:34:10 2022 -0400 Base Commit commitb3da886943Author: FartMaster69420 <78667902+FartMaster69420@users.noreply.github.com> Date: Fri Apr 15 21:20:05 2022 -0400 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. commit6601e9cac5Author: Runa Dacino <dacinoorder@gmail.com> Date: Sat Apr 16 02:00:26 2022 +0200 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 commit673571c90dAuthor: CubeJackal <cubejackal@hotmail.com> Date: Fri Apr 15 19:11:16 2022 +0100 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). commit94e166cbbaAuthor: VirgoBot <39653486+VirgoBot@users.noreply.github.com> Date: Fri Apr 15 05:41:33 2022 -0400 Dress Shirt Undershirts commitb9a21b121fAuthor: Spookerton <spkrtn@pm.me> Date: Fri Apr 15 10:41:14 2022 +0100 Merge pull request #8535 from Cerebulon/dressshirts Dress Shirt Undershirts commit17ec144b1bAuthor: GhostActual <evening.quill103@gmail.com> Date: Fri Apr 15 04:37:42 2022 -0400 whoops commit1ac8b601a6Author: GhostActual <evening.quill103@gmail.com> Date: Fri Apr 15 04:19:08 2022 -0400 Base Commit commitf0d0c39f46Author: FartMaster69420 <78667902+FartMaster69420@users.noreply.github.com> Date: Thu Apr 14 23:47:05 2022 -0400 Removing empty lines commit8240013f75Author: FartMaster69420 <78667902+FartMaster69420@users.noreply.github.com> Date: Thu Apr 14 23:46:13 2022 -0400 Fix Missed a '/' commitab77f273bfAuthor: FartMaster69420 <78667902+FartMaster69420@users.noreply.github.com> Date: Thu Apr 14 23:33:47 2022 -0400 Update vorestation.dme commit2c6cc7f146Author: FartMaster69420 <78667902+FartMaster69420@users.noreply.github.com> Date: Thu Apr 14 23:33:25 2022 -0400 Flight Vore Toggle Adding a toggle to enable flight vore commit7ec163d624Author: FartMaster69420 <78667902+FartMaster69420@users.noreply.github.com> Date: Thu Apr 14 22:58:52 2022 -0400 Initial Initial commit, my lazy ass is only now doing it. commit77e1963bb4Author: klaasjared <86997650+GhostActual@users.noreply.github.com> Date: Thu Apr 14 16:31:15 2022 -0400 Update computer.dmi commitb1adccfb66Author: klaasjared <86997650+GhostActual@users.noreply.github.com> Date: Thu Apr 14 15:55:41 2022 -0400 Update library.dmi commitd7abb2e81eAuthor: FartMaster69420 <78667902+FartMaster69420@users.noreply.github.com> Date: Thu Apr 14 00:01:59 2022 -0400 Fixing issues Adds a check for stacktype and a turf check, preventing bad behavior. commit3590fa34cfAuthor: liache <76535603+liache@users.noreply.github.com> Date: Wed Apr 13 17:24:59 2022 -0400 Update station_special_abilities_vr.dm commit7660cd1463Author: FartMaster69420 <78667902+FartMaster69420@users.noreply.github.com> Date: Wed Apr 13 16:34:27 2022 -0400 Full Stack Algea Lets biogenerators print a stack of 50 algae Sheets. The price is the same persheet as the 4 sheet stack. commit91514639feAuthor: VerySoft <a.roaming.shadow@gmail.com> Date: Wed Apr 13 00:03:33 2022 -0400 This too commit4099842033Author: VerySoft <a.roaming.shadow@gmail.com> Date: Tue Apr 12 21:41:56 2022 -0400 Little GB thing commitcdb1b8f43dMerge:c05a740ec182d7e2a758Author: Casey <a.roaming.shadow@gmail.com> Date: Tue Apr 12 21:40:48 2022 -0400 Merge pull request #12720 from liache/Liache-PatchGrippers Update drone_items.dm Magnetic Gripper commitc05a740ec1Merge:4da764970c3b597ff680Author: Casey <a.roaming.shadow@gmail.com> Date: Tue Apr 12 21:40:02 2022 -0400 Merge pull request #12719 from CubeJackal/master Adds eastern dragon taur sprite commit82d7e2a758Author: liache <76535603+liache@users.noreply.github.com> Date: Tue Apr 12 20:58:21 2022 -0400 Update drone_items.dm commit3b597ff680Author: CubeJackal <cubejackal@hotmail.com> Date: Tue Apr 12 18:42:09 2022 +0100 Adds eastern dragon taur sprite Three colours, clipping mask included. Enjoy spaghetti. commit4da764970cMerge:4114fd68e2ec39d1dbaeAuthor: Casey <a.roaming.shadow@gmail.com> Date: Mon Apr 11 22:31:29 2022 -0400 Merge pull request #12717 from liache/patch-liache Update tether-03-surface3.dmm commitbc85d8eac4Author: FartMaster69420 <78667902+FartMaster69420@users.noreply.github.com> Date: Mon Apr 11 20:25:45 2022 -0400 Update weapons_vr.dm commit0ed24be8ddAuthor: FartMaster69420 <78667902+FartMaster69420@users.noreply.github.com> Date: Mon Apr 11 20:17:24 2022 -0400 Cleanup testcode commit0f7d581dcdAuthor: FartMaster69420 <78667902+FartMaster69420@users.noreply.github.com> Date: Mon Apr 11 20:12:35 2022 -0400 Update span_vr.dm commit4d1e0e4a51Author: FartMaster69420 <78667902+FartMaster69420@users.noreply.github.com> Date: Mon Apr 11 18:21:02 2022 -0400 Initial commitec39d1dbaeAuthor: liache <76535603+liache@users.noreply.github.com> Date: Mon Apr 11 17:54:22 2022 -0400 Update tether-03-surface3.dmm commitc6681b3370Author: ItsSelis <selis@xynolabs.com> Date: Mon Apr 11 23:13:50 2022 +0200 More TGUI (And UI in general) commit4114fd68e2Merge:f7a9906893abbc699e38Author: Casey <a.roaming.shadow@gmail.com> Date: Mon Apr 11 15:26:42 2022 -0400 Merge pull request #12715 from Very-Soft/capturecrystalfix Allow capture crystals without owners to obtain owners commitf7a9906893Merge:31690e77ba16be8817eaAuthor: Casey <a.roaming.shadow@gmail.com> Date: Mon Apr 11 15:26:27 2022 -0400 Merge pull request #12692 from VOREStation/upstream-merge-8505 [MIRROR] Spiderlings die if they have 0 health commit31690e77baMerge:a5c421eef7fc03ca340cAuthor: Casey <a.roaming.shadow@gmail.com> Date: Mon Apr 11 15:25:19 2022 -0400 Merge pull request #12708 from VOREStation/upstream-merge-8511 [MIRROR] updated get_atom_on_turf commit99c2598c96Merge:316137137dd897561abaAuthor: Casey <a.roaming.shadow@gmail.com> Date: Mon Apr 11 15:24:42 2022 -0400 Merge pull request #12707 from KillianKirilenko/8431-fix Allergen CE conversion fix commita5c421eef7Merge:81d13588f7bb015daad3Author: Casey <a.roaming.shadow@gmail.com> Date: Mon Apr 11 15:23:49 2022 -0400 Merge pull request #12698 from FartMaster69420/xenobio-upgrades-clean Xenobio Upgrades commit6540aeb9b4Author: ItsSelis <selis@xynolabs.com> Date: Mon Apr 11 19:40:22 2022 +0200 Added TGUI to Stock Exchange First simple version of handling some data. Responding to acts of button presses and some other things still have to be done. commitfbcc41ef02Author: GhostActual <evening.quill103@gmail.com> Date: Wed Mar 23 02:17:48 2022 -0400 Base Commit commit10bcc21ce3Author: GhostActual <evening.quill103@gmail.com> Date: Fri Apr 8 13:43:22 2022 -0400 Base Commit commitabbc699e38Author: VerySoft <a.roaming.shadow@gmail.com> Date: Sun Apr 10 21:14:55 2022 -0400 Allow capture crystals without owners to obtain owners Wow! Fixes https://github.com/VOREStation/VOREStation/issues/12699 commitfc03ca340cAuthor: VirgoBot <39653486+VirgoBot@users.noreply.github.com> Date: Sun Apr 10 16:53:08 2022 -0400 updated get_atom_on_turf commit9e189a348cAuthor: Atermonera <atermonera@gmail.com> Date: Sun Apr 10 12:52:52 2022 -0800 Merge pull request #8511 from Spookerton/spkrtn/cng/a-little-silhouetto updated get_atom_on_turf commitd897561abaAuthor: Killian <49700375+KillianKirilenko@users.noreply.github.com> Date: Sun Apr 10 21:12:38 2022 +0100 allergen CE conversion fix commit81d13588f7Merge:50cf9f514144a3b1543bAuthor: Casey <a.roaming.shadow@gmail.com> Date: Sun Apr 10 15:57:34 2022 -0400 Merge pull request #12704 from Very-Soft/backtotether Back to Tether commit50cf9f5141Merge:b84fcf5fb5be70059aa9Author: Casey <a.roaming.shadow@gmail.com> Date: Sun Apr 10 15:48:50 2022 -0400 Merge pull request #12701 from FartMaster69420/stack-stacking Fixing Stack Stacking commitb84fcf5fb5Merge:0077e455af2c0622cd24Author: Casey <a.roaming.shadow@gmail.com> Date: Sun Apr 10 15:48:32 2022 -0400 Merge pull request #12703 from FartMaster69420/sapience_vore Sapience Vore commit44a3b1543bAuthor: VerySoft <a.roaming.shadow@gmail.com> Date: Sun Apr 10 15:46:59 2022 -0400 Back to Tether commit2c0622cd24Author: FartMaster69420 <78667902+FartMaster69420@users.noreply.github.com> Date: Sun Apr 10 15:16:44 2022 -0400 Cleanup commit5c3d888cbeAuthor: FartMaster69420 <78667902+FartMaster69420@users.noreply.github.com> Date: Sun Apr 10 14:42:18 2022 -0400 Sapience Animal Nom Gives the animal nom verb to sapient critters, even if they are not vore mobs. commitbe70059aa9Author: FartMaster69420 <78667902+FartMaster69420@users.noreply.github.com> Date: Sun Apr 10 13:56:39 2022 -0400 Fixing Stack Stacking Somehow I disabled stack_vr.dm in a previous PR. This fixes it. commitbb015daad3Author: FartMaster69420 <78667902+FartMaster69420@users.noreply.github.com> Date: Sat Apr 9 23:12:42 2022 -0400 Update xenobio_toys_vr.dm this is why I shouldn't code late at night commitd0032979d4Author: FartMaster69420 <78667902+FartMaster69420@users.noreply.github.com> Date: Sat Apr 9 23:05:04 2022 -0400 Update weapons_vr.dm Whoops commit05c5d5f44aAuthor: FartMaster69420 <78667902+FartMaster69420@users.noreply.github.com> Date: Sat Apr 9 22:59:32 2022 -0400 Update weapons_vr.dm Fixing a derp commit12af0b93bbAuthor: FartMaster69420 <78667902+FartMaster69420@users.noreply.github.com> Date: Sat Apr 9 22:45:07 2022 -0400 Update weapons_vr.dm Heck, how'd I miss this commitcd9c7fab9eAuthor: FartMaster69420 <78667902+FartMaster69420@users.noreply.github.com> Date: Sat Apr 9 22:27:33 2022 -0400 Cleanup Removing cut content commitd220b9b73dAuthor: FartMaster69420 <78667902+FartMaster69420@users.noreply.github.com> Date: Sat Apr 9 22:26:03 2022 -0400 Near final commitf2a45d1695Author: FartMaster69420 <78667902+FartMaster69420@users.noreply.github.com> Date: Sat Apr 9 21:55:46 2022 -0400 Adding recipes to the lathe. commitf7d3111f2aAuthor: FartMaster69420 <78667902+FartMaster69420@users.noreply.github.com> Date: Sat Apr 9 18:01:11 2022 -0400 Portable Grinder and Bag commit0077e455afMerge:78d455f97a5e01498f0dAuthor: Casey <a.roaming.shadow@gmail.com> Date: Sat Apr 9 17:49:33 2022 -0400 Merge pull request #12691 from VOREStation/upstream-merge-8516 [MIRROR] Station's Message Monitor Functions Again commit78d455f97aMerge:d8515387bca22c2be869Author: Casey <a.roaming.shadow@gmail.com> Date: Sat Apr 9 17:49:01 2022 -0400 Merge pull request #12696 from Heroman3003/vision-exclusivity Makes NIFSoft vision modifiers mutually exclusive with goggle/visor based ones commita22c2be869Author: Heroman <alesha3000@list.ru> Date: Sun Apr 10 07:35:31 2022 +1000 Makes NIFSoft vision modifiers mutually exclusive with goggle/visor based ones commitd8515387bcMerge:713823d286619c84a6e7Author: Casey <a.roaming.shadow@gmail.com> Date: Sat Apr 9 17:09:09 2022 -0400 Merge pull request #12695 from Very-Soft/gbtweaks Some final tweaks commit619c84a6e7Author: VerySoft <a.roaming.shadow@gmail.com> Date: Sat Apr 9 16:40:41 2022 -0400 Fixy commit26288ff9cfAuthor: VerySoft <a.roaming.shadow@gmail.com> Date: Sat Apr 9 16:30:09 2022 -0400 Some final tweaks Just tidies up a few wires, makes sure tether and SD are ready to be run with some of the new changes to CC and misc also moves the inside program out of restricted for holodeck commitdfbdd237deMerge:4c193229ae713823d286Author: FartMaster69420 <78667902+FartMaster69420@users.noreply.github.com> Date: Sat Apr 9 12:53:04 2022 -0400 Merge branch 'master' into xenobio-upgrades commit713823d286Merge:7e6b168d82feb32cd1eeAuthor: Casey <a.roaming.shadow@gmail.com> Date: Sat Apr 9 05:53:01 2022 -0400 Merge pull request #12690 from Very-Soft/gbtweaks More map tweaks! commit16be8817eaAuthor: VirgoBot <39653486+VirgoBot@users.noreply.github.com> Date: Sat Apr 9 05:51:42 2022 -0400 Spiderlings die if they have 0 health commit9dbce5bd7eAuthor: Spookerton <spkrtn@pm.me> Date: Sat Apr 9 10:50:25 2022 +0100 Merge pull request #8505 from Atermonera/squished_spiderling Spiderlings die if they have 0 health commit5e01498f0dAuthor: VirgoBot <39653486+VirgoBot@users.noreply.github.com> Date: Sat Apr 9 05:51:36 2022 -0400 Station's Message Monitor Functions Again commitc9cc5920c8Author: Spookerton <spkrtn@pm.me> Date: Sat Apr 9 10:50:46 2022 +0100 Merge pull request #8516 from Sypsoti/mmc-fix Station's Message Monitor Functions Again commitfeb32cd1eeAuthor: VerySoft <a.roaming.shadow@gmail.com> Date: Sat Apr 9 05:18:48 2022 -0400 This too commitcedc6348f7Author: VerySoft <a.roaming.shadow@gmail.com> Date: Sat Apr 9 05:14:56 2022 -0400 More map tweaks! Revamps the dorms and adds bathrooms Also makes daytime longer than nighttime commit7e6b168d82Merge:a73f9f3bfe1835230e9eAuthor: Casey <a.roaming.shadow@gmail.com> Date: Sat Apr 9 00:42:00 2022 -0400 Merge pull request #12685 from FartMaster69420/exosuit-fix What's that material??? & Techdisk Bluescreen fix commita73f9f3bfeMerge:13380238fb2bb6c955baAuthor: Casey <a.roaming.shadow@gmail.com> Date: Sat Apr 9 00:40:48 2022 -0400 Merge pull request #12682 from Rykka-Stormheart/shep-dev-TGMC-ammo-HUD TGMC Ammo HUD Earlyport commit13380238fbMerge:ccef29fa1bc152b43c41Author: Casey <a.roaming.shadow@gmail.com> Date: Sat Apr 9 00:40:38 2022 -0400 Merge pull request #12681 from Very-Soft/gbtweaks Map tweaks! commitc152b43c41Author: VerySoft <a.roaming.shadow@gmail.com> Date: Sat Apr 9 00:28:07 2022 -0400 T WEAK UWU commitccef29fa1bMerge:ec84f1b428f4d1f825f7Author: Casey <a.roaming.shadow@gmail.com> Date: Sat Apr 9 00:20:45 2022 -0400 Merge pull request #12687 from Heroman3003/nerfnd Nerfs gravitons and morphium, adds lots of boards into autolathe commitf4d1f825f7Author: Heroman <alesha3000@list.ru> Date: Sat Apr 9 05:44:36 2022 +1000 Nerfs gravitons and morphium, adds lots of boards into autolathe commit1835230e9eAuthor: FartMaster69420 <78667902+FartMaster69420@users.noreply.github.com> Date: Fri Apr 8 14:25:19 2022 -0400 Fixing tech disk bluescreen Putting it here because TGUI bundles are annoying and I don't wanna wait till we get merged. commit20272a881cAuthor: VerySoft <a.roaming.shadow@gmail.com> Date: Thu Apr 7 23:15:23 2022 -0400 Tweaks commit9752b5b363Author: FartMaster69420 <78667902+FartMaster69420@users.noreply.github.com> Date: Thu Apr 7 21:45:02 2022 -0400 Remove minitest commit315e1bd069Author: FartMaster69420 <78667902+FartMaster69420@users.noreply.github.com> Date: Thu Apr 7 21:39:56 2022 -0400 Update tgui.bundle.js commit6586aa3ccaAuthor: FartMaster69420 <78667902+FartMaster69420@users.noreply.github.com> Date: Thu Apr 7 21:39:42 2022 -0400 Tooltip fix The tooltip here was setup in such a way it would never work. This fix. commit2601b68fdbAuthor: FartMaster69420 <78667902+FartMaster69420@users.noreply.github.com> Date: Thu Apr 7 19:45:04 2022 -0400 initial commit02c3565f46Author: VerySoft <a.roaming.shadow@gmail.com> Date: Thu Apr 7 16:58:27 2022 -0400 T W E A K S commit2bb6c955baAuthor: Rykka <sorren15@gmail.com> Date: Thu Apr 7 01:58:37 2022 -0600 TGMC Ammo HUD Earlyport Ports over TGMC's Ammo HUD and all relevant code, adapted to work for Polaris's guns. This took me several days, but hey, I learned a bunch. <: Time to port Aim Mode + Mentorhelp. :3c - All guns now have an ammo HUD sprite. If one lacks one, it will be ??? or blank, at which point, make an issue report, as all guns should be working by now. - Guns will display how many rounds they have left until ammunition runs dry. - Ammo will only count the casings that CURRENTLY have a projectile in them. This is slightly unrealistic, yes, but it is better and more intuitive for the player. This also enables guns like the revolver to work, given they recycle casings. - Up to 4 ammo HUDs can be displayed at once, but given we lack TGMC's attachments and guncode, you'll only ever usually see 2. TBD on porting over TGMC guncode. <: - Ammunition for multiple guns has different colors in the HUD based on what you currently have loaded. - If you're looking at this later on to add new things. DON'T USE _FLASH IN THE HUD_STATE_EMPTY. THE _FLASH IS ADDED ON BY CODE. - Grenades have a hud_state, pending us ever porting over a grenade launcher. Rockets ALSO have a hud_state. Example of Laser/Energy Weapons: https://i.imgur.com/MGvqGxh.mp4 Captain's Gun: https://i.imgur.com/Wd0SS3C.gif Full Test of all weapons: https://streamable.com/usp4dy Upstream port of https://github.com/CHOMPStation2/CHOMPStation2/pull/4033 Earlyport of https://github.com/PolarisSS13/Polaris/pull/8513, with adaptations for VORE's files (Specifically the ML3M medigun and cell-loaded weaponry.) Credit to @SilencedMP5A5 for helping me with sprite names, testing, and making the Full Test video. <3 commit4b924d005dAuthor: VerySoft <a.roaming.shadow@gmail.com> Date: Wed Apr 6 23:23:43 2022 -0400 Map tweaks! Purge CO2 and edit mime door access commitec84f1b428Merge:5b7871baeff121f7fa1aAuthor: Casey <a.roaming.shadow@gmail.com> Date: Wed Apr 6 23:22:43 2022 -0400 Merge pull request #12680 from FartMaster69420/stack-stacking Stack Stacking commit5b7871baefMerge:bd39092b5007e9bee973Author: Casey <a.roaming.shadow@gmail.com> Date: Wed Apr 6 23:21:05 2022 -0400 Merge pull request #12676 from Runa-Dacino/Mining-Synth Organic/Synthethic NIFsoft disk functionality split commitbd39092b50Merge:95a8dcf4f1047de77d9eAuthor: Casey <a.roaming.shadow@gmail.com> Date: Wed Apr 6 23:19:44 2022 -0400 Merge pull request #12675 from Scorpion-117/Map-changes Adding one railing to stairs by the bridge commitf121f7fa1aAuthor: FartMaster69420 <78667902+FartMaster69420@users.noreply.github.com> Date: Wed Apr 6 21:26:45 2022 -0400 Final Removing debug stuff and disabling minitest commit8fa89518baAuthor: FartMaster69420 <78667902+FartMaster69420@users.noreply.github.com> Date: Wed Apr 6 21:01:13 2022 -0400 Cleanup commit0f71072173Author: FartMaster69420 <78667902+FartMaster69420@users.noreply.github.com> Date: Wed Apr 6 20:40:08 2022 -0400 Stacking Stacks commite6912d1228Author: FartMaster69420 <78667902+FartMaster69420@users.noreply.github.com> Date: Wed Apr 6 20:33:52 2022 -0400 minitest commit047de77d9eAuthor: Scorpion-117 <33163527+Scorpion-117@users.noreply.github.com> Date: Wed Apr 6 15:53:36 2022 -0700 Adding one railing to stairs by the bridge Testing to see if I'm doing all of this right. Just adding a railing as a quick test. commit07e9bee973Author: Runa Dacino <dacinoorder@gmail.com> Date: Thu Apr 7 00:08:19 2022 +0200 Organic/Synthethic functionality split Adds different functionality for when a NIFsoft disk is used on an organic vs synthethic carbon mob. This is mostly inconsequential, bar for mining NIFsoft, where organics receive respirocytes (as has always been the case), while synthetics receive heat-sink and pressure seals. commit95a8dcf4f1Merge:4784eb723ce706322e6bAuthor: Casey <a.roaming.shadow@gmail.com> Date: Wed Apr 6 17:27:53 2022 -0400 Merge pull request #12671 from Verkister/patch-113 Makes mobs not spawn with id unless defined so commit4784eb723cMerge:9af92070f3706c9f767dAuthor: Casey <a.roaming.shadow@gmail.com> Date: Wed Apr 6 17:27:29 2022 -0400 Merge pull request #12672 from BonniePandora/Catslug-mania-3.0 Catslug mania 3.0 commit9af92070f3Merge:90707d2bf0be8114e3b8Author: Casey <a.roaming.shadow@gmail.com> Date: Wed Apr 6 17:26:13 2022 -0400 Merge pull request #12673 from lm40/master Makes me a clown commitbe8114e3b8Author: lm40 <lm40@users.noreply.github.com> Date: Wed Apr 6 15:07:30 2022 -0400 Makes someone else a clown too commit92748e8002Author: lm40 <lm40@users.noreply.github.com> Date: Wed Apr 6 14:35:25 2022 -0400 Makes me a clown commit706c9f767dAuthor: Pandora <pancake_29@live.co.uk> Date: Wed Apr 6 16:20:55 2022 +0100 Forgor those bits. commit78131fcb68Author: Pandora <pancake_29@live.co.uk> Date: Wed Apr 6 16:08:51 2022 +0100 Actually adds the damn capslug scarf commita8f989268dAuthor: Pandora <pancake_29@live.co.uk> Date: Wed Apr 6 16:02:36 2022 +0100 capslug scarf commit65b5f05406Author: Pandora <pancake_29@live.co.uk> Date: Wed Apr 6 16:01:45 2022 +0100 capslug holders commite52c77933dAuthor: Pandora <pancake_29@live.co.uk> Date: Wed Apr 6 16:00:52 2022 +0100 New slugge added commita22f27ee1dAuthor: Pandora <pancake_29@live.co.uk> Date: Wed Apr 6 15:58:58 2022 +0100 Update gb-z2.dmm commit0dbc8666afAuthor: Pandora <pancake_29@live.co.uk> Date: Wed Apr 6 15:57:44 2022 +0100 Update ventcrawl.dm commit3f9b61a0d5Author: Pandora <pancake_29@live.co.uk> Date: Wed Apr 6 15:55:52 2022 +0100 Update catslug.dm commite706322e6bAuthor: Verkister <superverkelian@hotmail.com> Date: Wed Apr 6 15:19:40 2022 +0300 Update simple_mob.dm commitb7ff309b13Author: Verkister <superverkelian@hotmail.com> Date: Wed Apr 6 15:18:35 2022 +0300 Update catslug.dm commit1033650c66Author: Verkister <superverkelian@hotmail.com> Date: Wed Apr 6 15:16:54 2022 +0300 Makes mobs not spawn with id unless defined so Makes mob ids only spawn on mobs that should come with them rather than jamming one into every single mouse and cockroach and so on. commit90707d2bf0Merge:46334f6670fa748dc59aAuthor: Casey <a.roaming.shadow@gmail.com> Date: Wed Apr 6 04:28:33 2022 -0400 Merge pull request #12669 from GhostActual/aurora_toys Aurora Toys commit46334f6670Merge:a5c9bc4658aa24ec99fdAuthor: Casey <a.roaming.shadow@gmail.com> Date: Wed Apr 6 04:26:08 2022 -0400 Merge pull request #12668 from GhostActual/explorer_pdas Explorer PDAs commita5c9bc4658Merge:fa66b849b548ce47e16aAuthor: Casey <a.roaming.shadow@gmail.com> Date: Wed Apr 6 04:25:12 2022 -0400 Merge pull request #12667 from GhostActual/aurora_bureaucracy Aurora Bureaucracy commitfa66b849b5Merge:487d7b0c9a0817629e5dAuthor: Casey <a.roaming.shadow@gmail.com> Date: Wed Apr 6 04:21:16 2022 -0400 Merge pull request #12666 from Very-Soft/gbtweaks Account for multiZ commit0817629e5dAuthor: VerySoft <a.roaming.shadow@gmail.com> Date: Wed Apr 6 04:10:23 2022 -0400 This too commitfa748dc59aAuthor: GhostActual <evening.quill103@gmail.com> Date: Wed Apr 6 03:09:15 2022 -0400 Revert "Base Commit" This reverts commit5e9a4eccad. commit7c7bbed603Merge:5e9a4eccade2f1ddd3f1Author: GhostActual <evening.quill103@gmail.com> Date: Wed Apr 6 03:08:58 2022 -0400 Merge branch 'aurora_toys' of https://github.com/GhostActual/VOREStation into aurora_toys commit5e9a4eccadAuthor: GhostActual <evening.quill103@gmail.com> Date: Wed Apr 6 03:08:04 2022 -0400 Base Commit commite2f1ddd3f1Author: GhostActual <evening.quill103@gmail.com> Date: Wed Apr 6 03:08:04 2022 -0400 Base Commit commitaa24ec99fdAuthor: GhostActual <evening.quill103@gmail.com> Date: Wed Apr 6 01:11:29 2022 -0400 Base Commit forgor commit48ce47e16aAuthor: GhostActual <evening.quill103@gmail.com> Date: Wed Apr 6 00:28:31 2022 -0400 Fix commitcb1f9d4776Author: GhostActual <evening.quill103@gmail.com> Date: Wed Apr 6 00:16:46 2022 -0400 Base Commit commita36898b97cAuthor: VerySoft <a.roaming.shadow@gmail.com> Date: Tue Apr 5 22:53:03 2022 -0400 Account for multiZ commit487d7b0c9aMerge:6dff41386c65e1706c24Author: Casey <a.roaming.shadow@gmail.com> Date: Tue Apr 5 22:45:31 2022 -0400 Merge pull request #12665 from Very-Soft/ventcrawls ACTUALLY fix that ventcrawl. >:C commit65e1706c24Author: VerySoft <a.roaming.shadow@gmail.com> Date: Tue Apr 5 22:31:20 2022 -0400 ACTUALLY fix that ventcrawl. >:C commit6dff41386cMerge:592c8441ded191eb73afAuthor: Casey <a.roaming.shadow@gmail.com> Date: Tue Apr 5 22:14:52 2022 -0400 Merge pull request #12663 from Very-Soft/ventcrawls Allow mobs to ventcrawl with their mobid commit592c8441deMerge:062a7437c6acac0891e3Author: Casey <a.roaming.shadow@gmail.com> Date: Tue Apr 5 22:11:48 2022 -0400 Merge pull request #12662 from GhostActual/donk-pockets New Donk-pockets commitd191eb73afAuthor: VerySoft <a.roaming.shadow@gmail.com> Date: Tue Apr 5 22:06:24 2022 -0400 Allow mobs to ventcrawl with their mobid Also lets drones vent with their emissive blockers commitacac0891e3Author: GhostActual <evening.quill103@gmail.com> Date: Tue Apr 5 21:53:26 2022 -0400 Fix commit062a7437c6Merge:4aca8a50576b18367970Author: Casey <a.roaming.shadow@gmail.com> Date: Tue Apr 5 21:44:06 2022 -0400 Merge pull request #12660 from Very-Soft/gbtweaks Groundbase Tweaks commit99eaf5f21bAuthor: GhostActual <evening.quill103@gmail.com> Date: Tue Apr 5 20:28:25 2022 -0400 Base Commit Secondary Commit Third Commit commit6b18367970Author: VerySoft <a.roaming.shadow@gmail.com> Date: Tue Apr 5 21:32:33 2022 -0400 This too commit6253fafdb6Author: VerySoft <a.roaming.shadow@gmail.com> Date: Tue Apr 5 21:19:41 2022 -0400 Groundbase Tweaks commit4aca8a5057Merge:a01915aba9b84da2bbeaAuthor: Casey <a.roaming.shadow@gmail.com> Date: Tue Apr 5 20:56:02 2022 -0400 Merge pull request #12659 from Very-Soft/tweaks Adjusts trees and vendor spawners commite92bd9e61bAuthor: ItsSelis <selis@xynolabs.com> Date: Wed Apr 6 02:26:25 2022 +0200 Added forbidden upgrade to printer commitb84da2bbeaAuthor: VerySoft <a.roaming.shadow@gmail.com> Date: Tue Apr 5 20:23:23 2022 -0400 Adjusts trees and vendor spawners Added some weights to the vendor spawners, basically so the hotfoods vendor will appear less often than any other, and some of the more powerful/special vendors appear less often than the normal ones. Also adjusts the bigtrees. They were originally made just for gateway decoration, but with GB featuring them, they needed to be brought into line with normal stuff. They still have more health than normal trees, but it's less. Also they have stump sprites now. commita01915aba9Merge:096fe78f41eb26ddfb9eAuthor: Casey <a.roaming.shadow@gmail.com> Date: Tue Apr 5 20:17:16 2022 -0400 Merge pull request #12656 from VOREStation/upstream-merge-8494 [MIRROR] Fixes runtime with turrets and viscerators commit096fe78f41Merge:6dc1da702d7e4e7d8aebAuthor: Casey <a.roaming.shadow@gmail.com> Date: Tue Apr 5 20:16:40 2022 -0400 Merge pull request #12658 from GhostActual/synthetic_life_lorebook Synthetic Life Lorebook commit6dc1da702dMerge:c191bc94cad417c0012dAuthor: Casey <a.roaming.shadow@gmail.com> Date: Tue Apr 5 20:15:31 2022 -0400 Merge pull request #12624 from VOREStation/upstream-merge-8507 [MIRROR] Colors hud alerts according to their master object's color. commitc191bc94caMerge:725a8f3982c84184efbaAuthor: Casey <a.roaming.shadow@gmail.com> Date: Tue Apr 5 20:14:45 2022 -0400 Merge pull request #12650 from FartMaster69420/rteg-rped RPEDs for RTEGs and Rotory Generators commit725a8f3982Merge:d57a76988181fb721b6eAuthor: Casey <a.roaming.shadow@gmail.com> Date: Tue Apr 5 20:13:59 2022 -0400 Merge pull request #12653 from ItsSelis/patch-1 Resleeving exit button & Bluespace Radio fixed commit7e4e7d8aebAuthor: GhostActual <evening.quill103@gmail.com> Date: Tue Apr 5 18:30:17 2022 -0400 Secondary Commit commitbcb6a6c756Author: klaasjared <86997650+GhostActual@users.noreply.github.com> Date: Tue Apr 5 16:40:37 2022 -0400 Base Commit commiteb26ddfb9eAuthor: VirgoBot <39653486+VirgoBot@users.noreply.github.com> Date: Tue Apr 5 14:45:38 2022 -0400 Fixes runtime with turrets and viscerators commit6dfc5c2db1Author: Spookerton <spkrtn@pm.me> Date: Tue Apr 5 19:44:39 2022 +0100 Merge pull request #8494 from Verkister/patch-90 Fixes runtime with turrets and viscerators commita328d26d2bAuthor: VirgoBot <39653486+VirgoBot@users.noreply.github.com> Date: Tue Apr 5 14:40:25 2022 -0400 Ports Vaurca autohiss from Aurora to Zaddat commit3eee235c89Author: Spookerton <spkrtn@pm.me> Date: Tue Apr 5 19:39:15 2022 +0100 Merge pull request #8463 from listerla/buzzhiss Ports Vaurca autohiss from Aurora to Zaddat commit81fb721b6eAuthor: ItsSelis <selis@xynolabs.com> Date: Tue Apr 5 19:55:17 2022 +0200 Fixed Door Permission The room containing the messaging servers now has the same access levels as on Tether and the SD. commit20871cbb75Author: ItsSelis <selis@xynolabs.com> Date: Tue Apr 5 19:27:32 2022 +0200 Fixes #12651 commitde4c945561Author: ItsSelis <selis@xynolabs.com> Date: Tue Apr 5 19:07:53 2022 +0200 Actually fixing the radio commiteb1f156a98Author: ItsSelis <selis@xynolabs.com> Date: Tue Apr 5 18:12:45 2022 +0200 Bluespace Radio renamed & Exit button fixed commitc84184efbaAuthor: FartMaster69420 <78667902+FartMaster69420@users.noreply.github.com> Date: Tue Apr 5 10:32:29 2022 -0400 RTEG Parts replacer Allows RPEDs to upgrade RTEGs and their children (REGs included) commitd57a769881Merge:332b24a1217741934a73Author: Casey <a.roaming.shadow@gmail.com> Date: Mon Apr 4 21:27:50 2022 -0400 Merge pull request #12645 from Very-Soft/gbtweaks Map adjustments! commit7741934a73Author: VerySoft <a.roaming.shadow@gmail.com> Date: Mon Apr 4 21:17:18 2022 -0400 YEAH commit332b24a121Merge:2376a37b35ef6102243eAuthor: Casey <a.roaming.shadow@gmail.com> Date: Mon Apr 4 20:16:58 2022 -0400 Merge pull request #12643 from Very-Soft/gbtweaks Adds lots of cameras and holopads commitef6102243eAuthor: VerySoft <a.roaming.shadow@gmail.com> Date: Mon Apr 4 20:09:01 2022 -0400 AAAAAAAA commit7af57902dfAuthor: VerySoft <a.roaming.shadow@gmail.com> Date: Mon Apr 4 20:01:37 2022 -0400 Also ATMs commit430663e621Author: VerySoft <a.roaming.shadow@gmail.com> Date: Mon Apr 4 19:52:19 2022 -0400 These too commitc15a6a1ea4Author: VerySoft <a.roaming.shadow@gmail.com> Date: Mon Apr 4 19:42:29 2022 -0400 Woops commit49145c8a25Author: VerySoft <a.roaming.shadow@gmail.com> Date: Mon Apr 4 19:31:24 2022 -0400 Adds lots of cameras and holopads Among other things commit2376a37b35Merge:b6be31c7f2b0346f3f3aAuthor: Casey <a.roaming.shadow@gmail.com> Date: Mon Apr 4 17:14:33 2022 -0400 Merge pull request #12640 from Very-Soft/gbtweaks Dorms flags commitb0346f3f3aAuthor: VerySoft <a.roaming.shadow@gmail.com> Date: Mon Apr 4 16:45:09 2022 -0400 Dorms flags commitb6be31c7f2Merge:9a12d584050688267aafAuthor: Casey <a.roaming.shadow@gmail.com> Date: Mon Apr 4 16:13:35 2022 -0400 Merge pull request #12638 from Very-Soft/gbtweaks Another OM fix commit0688267aafAuthor: VerySoft <a.roaming.shadow@gmail.com> Date: Mon Apr 4 16:03:10 2022 -0400 Another OM fix commit9a12d58405Merge:ae401ce408937e8303f3Author: Casey <a.roaming.shadow@gmail.com> Date: Mon Apr 4 16:01:53 2022 -0400 Merge pull request #12636 from GhostActual/aurora-port-1 Hypospray Revamp commitae401ce408Merge:c10812a251e55c8d14a0Author: Casey <a.roaming.shadow@gmail.com> Date: Mon Apr 4 16:00:48 2022 -0400 Merge pull request #12637 from BonniePandora/Catslug-tidying-and-mob-ID Catslugs & Access; a tale of securing sensitive items. commit937e8303f3Author: GhostActual <evening.quill103@gmail.com> Date: Mon Apr 4 15:43:46 2022 -0400 Base Commit commite55c8d14a0Author: Pandora <pancake_29@live.co.uk> Date: Mon Apr 4 20:43:17 2022 +0100 Add files via upload commit60eba4ec1eAuthor: Pandora <pancake_29@live.co.uk> Date: Mon Apr 4 20:42:51 2022 +0100 Add files via upload commit77e39ed5b6Author: Pandora <pancake_29@live.co.uk> Date: Mon Apr 4 20:42:13 2022 +0100 Add files via upload commitb250b5963bAuthor: Pandora <pancake_29@live.co.uk> Date: Mon Apr 4 20:41:26 2022 +0100 Add files via upload commitc10812a251Merge:450841f58d17a1b0904cAuthor: Casey <a.roaming.shadow@gmail.com> Date: Mon Apr 4 15:25:56 2022 -0400 Merge pull request #12635 from Very-Soft/gbtweaks Various fixes and more GB tweaks commit17a1b0904cAuthor: VerySoft <a.roaming.shadow@gmail.com> Date: Mon Apr 4 15:14:55 2022 -0400 how bout dat commit5f5abd19c4Author: VerySoft <a.roaming.shadow@gmail.com> Date: Mon Apr 4 15:07:10 2022 -0400 >:C commitfe3199e42eAuthor: VerySoft <a.roaming.shadow@gmail.com> Date: Mon Apr 4 15:06:27 2022 -0400 how bout dat commit99a2df9deeAuthor: VerySoft <a.roaming.shadow@gmail.com> Date: Mon Apr 4 14:55:58 2022 -0400 Various fixes and more GB tweaks commit450841f58dMerge:5d24d5b2c3b31ee089acAuthor: Casey <a.roaming.shadow@gmail.com> Date: Mon Apr 4 13:47:32 2022 -0400 Merge pull request #12633 from Very-Soft/gbtweaks GB Update commitb31ee089acAuthor: VerySoft <a.roaming.shadow@gmail.com> Date: Mon Apr 4 13:38:08 2022 -0400 GB Update New stuff! commit5d24d5b2c3Merge:54bc8efb66165d4f1e1aAuthor: Casey <a.roaming.shadow@gmail.com> Date: Mon Apr 4 04:40:50 2022 -0400 Merge pull request #12631 from GhostActual/aurora-port-1 Mini Aurora Port commit54bc8efb66Merge:5b9cd84276b027ae404dAuthor: Casey <a.roaming.shadow@gmail.com> Date: Mon Apr 4 04:37:56 2022 -0400 Merge pull request #12630 from Very-Soft/gbtweaks Yet more map tweaks commitb027ae404dAuthor: VerySoft <a.roaming.shadow@gmail.com> Date: Mon Apr 4 04:22:26 2022 -0400 Oops commita7c68270a5Author: VerySoft <a.roaming.shadow@gmail.com> Date: Mon Apr 4 04:18:35 2022 -0400 YEAH commit40379d01d8Author: VerySoft <a.roaming.shadow@gmail.com> Date: Mon Apr 4 03:36:08 2022 -0400 I did it commit165d4f1e1aAuthor: GhostActual <evening.quill103@gmail.com> Date: Mon Apr 4 03:03:10 2022 -0400 Loadouts commit6c3c56f2b5Author: GhostActual <evening.quill103@gmail.com> Date: Mon Apr 4 02:32:41 2022 -0400 Hairnet Adds in https://github.com/VOREStation/VOREStation/pull/12590 commitfac05cdd40Author: GhostActual <evening.quill103@gmail.com> Date: Mon Apr 4 02:10:25 2022 -0400 Base Commit commitacf0c1e26aAuthor: VerySoft <a.roaming.shadow@gmail.com> Date: Mon Apr 4 00:19:34 2022 -0400 Yet more map tweaks commit5b9cd84276Merge:94d285ac665649830e0aAuthor: Casey <a.roaming.shadow@gmail.com> Date: Sun Apr 3 17:18:25 2022 -0400 Merge pull request #12627 from Very-Soft/gbtweaks More maptweaks! commit5649830e0aAuthor: VerySoft <a.roaming.shadow@gmail.com> Date: Sun Apr 3 17:06:05 2022 -0400 These ones too commitc16966540dAuthor: VerySoft <a.roaming.shadow@gmail.com> Date: Sun Apr 3 16:57:08 2022 -0400 Also this one commitbadc2db41cAuthor: VerySoft <a.roaming.shadow@gmail.com> Date: Sun Apr 3 16:48:25 2022 -0400 This one too commit95ab2238b6Author: VerySoft <a.roaming.shadow@gmail.com> Date: Sun Apr 3 16:37:09 2022 -0400 More maptweaks! commitd417c0012dAuthor: VirgoBot <39653486+VirgoBot@users.noreply.github.com> Date: Sun Apr 3 06:18:08 2022 -0400 Colors hud alerts according to their master object's color. commitae44491485Author: Spookerton <spkrtn@pm.me> Date: Sun Apr 3 11:17:22 2022 +0100 Merge pull request #8507 from Atermonera/buckled_hud_color Colors hud alerts according to their master object's color. commit94d285ac66Merge:e189858af25c25968737Author: Casey <a.roaming.shadow@gmail.com> Date: Sun Apr 3 04:26:51 2022 -0400 Merge pull request #12621 from Very-Soft/gbtweaks More GB Tweaks commite189858af2Merge:b9473ccb942dd9862192Author: Casey <a.roaming.shadow@gmail.com> Date: Sun Apr 3 04:17:20 2022 -0400 Merge pull request #12622 from Heroman3003/suslug Catslugs looking kinda sus?! commit5c25968737Author: VerySoft <a.roaming.shadow@gmail.com> Date: Sun Apr 3 04:16:53 2022 -0400 Yup commit2dd9862192Author: Heroman <alesha3000@list.ru> Date: Sun Apr 3 17:53:55 2022 +1000 Adds suslug commit9230920ffeAuthor: VerySoft <a.roaming.shadow@gmail.com> Date: Sun Apr 3 03:39:06 2022 -0400 Wow! commit36dee6cdcfAuthor: VerySoft <a.roaming.shadow@gmail.com> Date: Sun Apr 3 01:37:49 2022 -0400 More GB Tweaks commitb9473ccb94Merge:5d9f0462c13d57004141Author: Casey <a.roaming.shadow@gmail.com> Date: Sat Apr 2 23:31:31 2022 -0400 Merge pull request #12592 from GhostActual/tg-port-6 The Grand /TG Port - Part 6 commit5d9f0462c1Merge:73589bb510801533a69fAuthor: Casey <a.roaming.shadow@gmail.com> Date: Sat Apr 2 23:30:27 2022 -0400 Merge pull request #12579 from GhostActual/tg-port-5 The Grand /TG Port - Part 5 commit73589bb510Merge:561f6e3571397a65d3c4Author: Casey <a.roaming.shadow@gmail.com> Date: Sat Apr 2 23:28:42 2022 -0400 Merge pull request #12578 from GhostActual/tg-port-4 The Grand /TG Port - Part 4 commit561f6e3571Merge:086173c328d97ffa3c16Author: Casey <a.roaming.shadow@gmail.com> Date: Sat Apr 2 23:27:40 2022 -0400 Merge pull request #12577 from GhostActual/tg-port-3 The Grand /TG Port - Part 3 commit086173c328Merge:18bed5ef67b268b7bcfaAuthor: Casey <a.roaming.shadow@gmail.com> Date: Sat Apr 2 23:26:31 2022 -0400 Merge pull request #12576 from GhostActual/tg-port-2 The Grand /TG Port - Part 2 commit18bed5ef67Merge:d79c22cb769a99f5a755Author: Casey <a.roaming.shadow@gmail.com> Date: Sat Apr 2 23:24:08 2022 -0400 Merge pull request #12575 from GhostActual/tg-port-1 The Grand /TG Port - Part 1 commitd79c22cb76Merge:f7e62c3996946b76e933Author: Casey <a.roaming.shadow@gmail.com> Date: Sat Apr 2 23:23:52 2022 -0400 Merge pull request #12619 from Very-Soft/spookyghosts Updates On-Death message commitf7e62c3996Merge:6d14f23104d807544376Author: Casey <a.roaming.shadow@gmail.com> Date: Sat Apr 2 23:23:44 2022 -0400 Merge pull request #12618 from Heroman3003/outdoor_lights Fixes planet lights (hopefully not too hard) commit9a99f5a755Author: GhostActual <evening.quill103@gmail.com> Date: Sat Apr 2 22:55:19 2022 -0400 Update alienanimals_x32.dmi commit81c603f9d5Author: GhostActual <evening.quill103@gmail.com> Date: Thu Mar 31 23:13:37 2022 -0400 Base Commit commit946b76e933Author: VerySoft <a.roaming.shadow@gmail.com> Date: Sat Apr 2 22:31:41 2022 -0400 Updates On-Death message based on https://github.com/VOREStation/VOREStation/pull/12569 I just didn't like the tone of their edit, so I made my own! commit6d14f23104Merge:f2d739c912fca15b3982Author: Casey <a.roaming.shadow@gmail.com> Date: Sat Apr 2 22:21:06 2022 -0400 Merge pull request #12607 from VOREStation/upstream-merge-8476 [MIRROR] default client fps is 40 instead of match-server commitf2d739c912Merge:6ff5d7b9830c98fc18e7Author: Casey <a.roaming.shadow@gmail.com> Date: Sat Apr 2 22:20:13 2022 -0400 Merge pull request #12601 from AmayaWah/bluepanda blue panda subtype simplemob commit6ff5d7b983Merge:34ca489438b013381e21Author: Casey <a.roaming.shadow@gmail.com> Date: Sat Apr 2 22:18:38 2022 -0400 Merge pull request #12600 from ItsSelis/patch-2 Tiny pipe fix & gas leak event fix commit34ca489438Merge:3a29fda67a9e81fe7bbdAuthor: Casey <a.roaming.shadow@gmail.com> Date: Sat Apr 2 22:17:57 2022 -0400 Merge pull request #12597 from ItsSelis/patch-1 Added Whisper/Subtle/Rest Hotkeys for Borgs commit3a29fda67aMerge:72fbb37dbd58fc35ebcaAuthor: Casey <a.roaming.shadow@gmail.com> Date: Sat Apr 2 22:17:43 2022 -0400 Merge pull request #12598 from Very-Soft/gbtweaks Further tweaks commitd807544376Author: Heroman <alesha3000@list.ru> Date: Sun Apr 3 12:17:02 2022 +1000 Fixes planet lights (hopefully not too hard) commitfca15b3982Author: VirgoBot <39653486+VirgoBot@users.noreply.github.com> Date: Sat Apr 2 21:36:37 2022 -0400 default client fps is 40 instead of match-server commit733adb3221Author: Atermonera <atermonera@gmail.com> Date: Sat Apr 2 17:35:25 2022 -0800 Merge pull request #8476 from Spookerton/spkrtn/cng/default-fps-40 default client fps is 40 instead of match-server commit316137137dAuthor: Killian <49700375+KillianKirilenko@users.noreply.github.com> Date: Sun Apr 3 02:28:25 2022 +0100 Allergen CE Conversion commitb013381e21Author: Selis <selis@xynolabs.com> Date: Sun Apr 3 03:03:44 2022 +0200 Added missing maintenance tunnel commit0c98fc18e7Author: Amaya <amaya.rahl@gmail.com> Date: Sun Apr 3 01:11:39 2022 +0200 adjustments commita05197ae85Author: Amaya <amaya.rahl@gmail.com> Date: Sun Apr 3 00:57:39 2022 +0200 initial commit224d9aa03bAuthor: Selis <selis@xynolabs.com> Date: Sun Apr 3 00:50:44 2022 +0200 Fixed typo commit35b1b441f1Author: Selis <selis@xynolabs.com> Date: Sat Apr 2 22:27:09 2022 +0200 Isolating the map-specific code where it actually belongs commitf8bc03f339Author: Selis <selis@xynolabs.com> Date: Sat Apr 2 21:45:49 2022 +0200 Fixed gas leaks not appearing outside commit548939af68Author: Selis <selis@xynolabs.com> Date: Sat Apr 2 21:09:17 2022 +0200 Added missing pipes & moved scrubbers pump in Atmos commit58fc35ebcaAuthor: VerySoft <a.roaming.shadow@gmail.com> Date: Sat Apr 2 09:34:17 2022 -0400 Further tweaks commit9e81fe7bbdAuthor: Selis <selis@xynolabs.com> Date: Sat Apr 2 15:30:57 2022 +0200 Added Whisper/Subtle/Rest Hotkeys for Borgs commit72fbb37dbdMerge:959e5835af1473179b26Author: Casey <a.roaming.shadow@gmail.com> Date: Sat Apr 2 08:17:55 2022 -0400 Merge pull request #12595 from Very-Soft/gbtweaks Normal Map Tweaks commit1473179b26Author: VerySoft <a.roaming.shadow@gmail.com> Date: Sat Apr 2 08:07:33 2022 -0400 Yup commitb6422ee753Author: VerySoft <a.roaming.shadow@gmail.com> Date: Sat Apr 2 07:54:02 2022 -0400 Normal Map Tweaks More forgotten stuff, some fixes, and some tweaks should make night time bright enough to see in maybe hopefully, and makes it so mining's air isn't messed up. Also fixes the stairs to mining. commit959e5835afMerge:29ad6e8c73c0adfcf8d0Author: Casey <a.roaming.shadow@gmail.com> Date: Fri Apr 1 19:37:07 2022 -0400 Merge pull request #12593 from Very-Soft/gbtweaks Some things that were forgotten commitc0adfcf8d0Author: VerySoft <a.roaming.shadow@gmail.com> Date: Fri Apr 1 19:26:22 2022 -0400 active edges commit1f6277e370Author: VerySoft <a.roaming.shadow@gmail.com> Date: Fri Apr 1 19:11:47 2022 -0400 Some things that were forgotten commit3d57004141Author: GhostActual <evening.quill103@gmail.com> Date: Fri Apr 1 13:33:51 2022 -0400 Base Commit commit801533a69fAuthor: GhostActual <evening.quill103@gmail.com> Date: Fri Apr 1 13:39:44 2022 -0400 Revert "Base Commit" This reverts commit1de45df2ba. commit1de45df2baAuthor: GhostActual <evening.quill103@gmail.com> Date: Fri Apr 1 13:33:51 2022 -0400 Base Commit commitc9fc0acaedAuthor: VirgoBot <39653486+VirgoBot@users.noreply.github.com> Date: Fri Apr 1 13:26:25 2022 -0400 Fixes catwalks making footsteps on everything commit8aee6f371fAuthor: Spookerton <spkrtn@pm.me> Date: Fri Apr 1 18:25:02 2022 +0100 Merge pull request #8468 from Verkister/patch-88 Fixes catwalks making footsteps on everything commit29ad6e8c73Merge:9aa8329d611454b8b5bcAuthor: Casey <a.roaming.shadow@gmail.com> Date: Fri Apr 1 12:59:48 2022 -0400 Merge pull request #12573 from Rykka-Stormheart/shep-dev-xenochimera-hiss Allows Xenochimera to take Autohiss commit9aa8329d61Merge:962ae2c2e8802d91501aAuthor: Casey <a.roaming.shadow@gmail.com> Date: Fri Apr 1 12:59:25 2022 -0400 Merge pull request #12570 from Razgriz1032/master Fix for Kimono Sprites commit962ae2c2e8Merge:6fce207444ffb06bb3c8Author: Casey <a.roaming.shadow@gmail.com> Date: Fri Apr 1 12:58:57 2022 -0400 Merge pull request #12564 from Very-Soft/groundbase Rascal's Pass commitffb06bb3c8Author: VerySoft <a.roaming.shadow@gmail.com> Date: Fri Apr 1 12:44:05 2022 -0400 The last one hopefully commite011b05110Author: VerySoft <a.roaming.shadow@gmail.com> Date: Fri Apr 1 11:26:42 2022 -0400 Almost commit201b05d61dAuthor: VerySoft <a.roaming.shadow@gmail.com> Date: Fri Apr 1 10:55:57 2022 -0400 YEAH commit65434b62e9Author: VerySoft <a.roaming.shadow@gmail.com> Date: Fri Apr 1 09:39:47 2022 -0400 I am so sleepy commit397a65d3c4Author: GhostActual <evening.quill103@gmail.com> Date: Fri Apr 1 03:36:12 2022 -0400 Update vorestation.dme commitef2ef019cbAuthor: GhostActual <evening.quill103@gmail.com> Date: Fri Apr 1 03:33:58 2022 -0400 Base Commit commit59c9199aceAuthor: GhostActual <evening.quill103@gmail.com> Date: Fri Apr 1 02:42:14 2022 -0400 Base Commit commitd97ffa3c16Author: GhostActual <evening.quill103@gmail.com> Date: Fri Apr 1 02:04:21 2022 -0400 Base Commit commitb268b7bcfaAuthor: GhostActual <evening.quill103@gmail.com> Date: Fri Apr 1 01:03:30 2022 -0400 Base Commit commit1454b8b5bcAuthor: Rykka <sorren15@gmail.com> Date: Thu Mar 31 19:02:31 2022 -0600 Allows Xenochimera to take Unathi + Tajaran Autohiss commit16ff89b756Author: Rykka <sorren15@gmail.com> Date: Tue Jan 18 10:41:55 2022 -0800 Adds Temperature Adaptations to Xenochimera Trait List along with Autohiss. Ran these by Scree (Creator of Xenochimera) and he said these are fairly reasonable adaptations. They're neutral traits available to custom species, and given that Xenochimera are also able to pretty much mix and match a lot of stuff based on what they've eaten/evolved, this will allow greater roleplay/adaptations to occur - for instance, a xenochimera that is well-suited to the warmth of the desert is going to struggle in cold areas, and vice versa. (It's conceivable that a Xenochimera might eat a wolf, and adapt/evolve a super-thick coat of fur suited for winter planets.) Upstream port of https://github.com/CHOMPStation2/CHOMPStation2/pull/2948 commit4c193229aeAuthor: FartMaster69420 <78667902+FartMaster69420@users.noreply.github.com> Date: Thu Mar 31 20:46:10 2022 -0400 Update weapons_vr.dm commit788be364a6Author: Rykka <sorren15@gmail.com> Date: Thu Mar 31 15:45:32 2022 -0600 Upstream port of Trait Reorganization, only touches 3 traits The rest of the traits were a downstream, but these 3 I figure you lot might want for easier sorting. commite725a55a88Author: FartMaster69420 <78667902+FartMaster69420@users.noreply.github.com> Date: Thu Mar 31 17:31:50 2022 -0400 Update weapons_vr.dm commita43746367fAuthor: FartMaster69420 <78667902+FartMaster69420@users.noreply.github.com> Date: Thu Mar 31 16:38:52 2022 -0400 Cleanup, make the monkey gun work commit2d243de4e1Author: FartMaster69420 <78667902+FartMaster69420@users.noreply.github.com> Date: Thu Mar 31 15:08:07 2022 -0400 Update dartgun_vr.dm commit814b2188c1Author: VerySoft <a.roaming.shadow@gmail.com> Date: Thu Mar 31 09:02:22 2022 -0400 Going to slep commit802d91501aAuthor: Razgriz <razgriz1032@gmail.com> Date: Thu Mar 31 01:12:14 2022 -0700 Fix for Kimono Sprites Porting a fix made by RobotWeirdo. -Fix Kimono sprite offset. All the right-facing kimono sprites are now one more pixel to the right. This is because they did not fit to the character properly before and a line of pixels in that was the character's chest was showing. commit9ea925d206Author: Rykka <sorren15@gmail.com> Date: Thu Mar 31 02:09:00 2022 -0600 Fixes the Xenochimera Details not being their own line commit7291d4d721Author: FartMaster69420 <78667902+FartMaster69420@users.noreply.github.com> Date: Wed Mar 30 12:34:57 2022 -0400 Update weapons_vr.dm commit539f5c0dedAuthor: VerySoft <a.roaming.shadow@gmail.com> Date: Tue Mar 29 07:06:30 2022 -0400 goin' to bed commit2076e9769aAuthor: VerySoft <a.roaming.shadow@gmail.com> Date: Tue Mar 29 05:53:10 2022 -0400 This too come on now commiteb8fd70ba8Author: VerySoft <a.roaming.shadow@gmail.com> Date: Sat Mar 19 17:43:54 2022 -0400 gb commit6fce207444Merge:461aa0a22452064932bdAuthor: Casey <a.roaming.shadow@gmail.com> Date: Tue Mar 29 02:01:22 2022 -0400 Merge pull request #12561 from PastelPrinceDan/aerobio SD - V2 aerostat xenobio cell commit52064932bdAuthor: PastelPrinceDan <amayahsslut@gmail.com> Date: Tue Mar 29 06:24:49 2022 +0100 ae fix probably commit461aa0a224Merge:084441d48b7887f6c12fAuthor: Casey <a.roaming.shadow@gmail.com> Date: Mon Mar 28 19:07:05 2022 -0400 Merge pull request #12560 from Heroman3003/xenobio-fixes2 More xenobio fixes commit084441d48bMerge:aa183cc43f6e3d0f7238Author: Casey <a.roaming.shadow@gmail.com> Date: Mon Mar 28 19:05:19 2022 -0400 Merge pull request #12558 from Rykka-Stormheart/shep-dev-xenochimera-qol Xenochimera QOL PR commitaa183cc43fMerge:f87655dfedfdcc7d29bdAuthor: Casey <a.roaming.shadow@gmail.com> Date: Mon Mar 28 19:04:38 2022 -0400 Merge pull request #12562 from ItsSelis/patch-1 Adds sirlionfur to the Black-Eyed Shadekin Whitelist commitbfd97b4100Author: FartMaster69420 <78667902+FartMaster69420@users.noreply.github.com> Date: Mon Mar 28 14:30:39 2022 -0400 Initial Commit Setting the stage for xenobio guns commitfdcc7d29bdAuthor: Selis <selis@xynolabs.com> Date: Mon Mar 28 16:14:06 2022 +0200 Update whitelist https://forum.vore-station.net/viewtopic.php?f=45&t=2116 commit3cc39a9f1aAuthor: PastelPrinceDan <amayahsslut@gmail.com> Date: Mon Mar 28 10:04:20 2022 +0100 aerostat xenobio cell commit7887f6c12fAuthor: Heroman <alesha3000@list.ru> Date: Mon Mar 28 15:47:07 2022 +1000 More xenobio fixes commit6e3d0f7238Author: Rykka <sorren15@gmail.com> Date: Sun Mar 27 18:59:22 2022 -0600 Removes pain on defib for everyone, and removes xenochimera lick wounds Pending re-addition later for Xenochimera-specific implementation. commitf87655dfedMerge:d9bbb0a1c226b511cbe9Author: Casey <a.roaming.shadow@gmail.com> Date: Sun Mar 27 19:44:20 2022 -0400 Merge pull request #12559 from Rykka-Stormheart/shep-dev-coyawoo Adds Coyote Awoo Emotes, now with EVEN MORE awoo-age! commit26b511cbe9Author: Rykka <sorren15@gmail.com> Date: Sun Mar 27 16:55:28 2022 -0600 Adds Coyote Awoo Emotes, now with EVEN MORE awoo-age! Upstream port of https://github.com/CHOMPStation2/CHOMPStation2/pull/3816 ...but with this amazing offer we'll throw in 4 MORE AWOOS FOR THE PRICE OF ONE! Coyawoo is the main awroo. Coyawoo2 is a lengthy howly-awoo. Coyawoo 3 is a short yap, and awoo. Coyawoo 4 is several yaps and a short awoo. Coyawoo 5 is a whiny-grumble awoo-ish sound. commit079c2fd436Author: Rykka <sorren15@gmail.com> Date: Sun Mar 27 16:27:13 2022 -0600 Xenochimera Feral Reduction in Darkness OR Belly Xenochimera will now reduce ferality at a tickrate of 1 per Life tick while inside a belly or in darkness, same as the hunger reduction if they're full. They will not experience hallucinations and will get safety messages while inside a belly, as well as the status indicator confirming they're safe even in a lit environment. In total: If sated, feral will reduce by 1 per Life() tick. If in darkness _or_ a belly, feral will reduce by 1 per Life() tick. A feral of 220 will take 110 seconds to clear if satiated, not in a belly, and in light. Alternatively, it will take 55 seconds to clear if satiated **and** either in a belly _or_ in the darkness. Upstream port of https://github.com/CHOMPStation2/CHOMPStation2/pull/3823 and https://github.com/CHOMPStation2/CHOMPStation2/pull/3906 commitd4fb27da6fAuthor: Rykka <sorren15@gmail.com> Date: Sun Mar 27 16:22:46 2022 -0600 Xenochimera QOL PR Adds Regenerating + Hatch thrown alerts, similar to stunned/weakened/buckled, and clicking will show the remaining time to revive, or allow you to hatch. Defibrillators will now apply halloss to Xenochimera and set them feral on revive. Defibrillators will now apply halloss (pain) to everyone on revive. Medscanners will now display if a Xenochimera is regenerating or needs more protein, and if a 'chimera is dead, will warn that they require sedation. Reconstitution cooldown reduced from 1 hour to 10 minutes. Regeneration will no longer handle ferality in the middle of it, preventing edge-case *twitches while clearly regenerating. Regeneration will now have an audible + visible cue that plays on a 2% chance. Xenochimera have gained the Lick Wounds Verb. Lick Wounds has been modified to allow treating self-injuries, and injuries of the mob next to you. Given how limited the use is and how often bandages + chems are just flat-out better, this shouldn't be a huge balance issue, IMO. commitd9bbb0a1c2Merge:94eb28e32d5d0f8782cfAuthor: Casey <a.roaming.shadow@gmail.com> Date: Sun Mar 27 16:24:59 2022 -0400 Merge pull request #12556 from Very-Soft/backtosd Back to SD commit5d0f8782cfAuthor: VerySoft <a.roaming.shadow@gmail.com> Date: Sun Mar 27 16:16:01 2022 -0400 Back to SD Ship time commit94eb28e32dMerge:bd65b8dc0fc6b6d218b6Author: Casey <a.roaming.shadow@gmail.com> Date: Sun Mar 27 16:14:23 2022 -0400 Merge pull request #12555 from foopwo/succtheairaway Adds siphon vent to Tether's autoresleever room. commitbd65b8dc0fMerge:8182a57feab8a5fb1522Author: Casey <a.roaming.shadow@gmail.com> Date: Sun Mar 27 15:19:08 2022 -0400 Merge pull request #12551 from BonniePandora/spaceslug Adds a new catslug, Miros, to the fuel depot commitb8a5fb1522Author: Pandora <pancake_29@live.co.uk> Date: Sun Mar 27 20:03:12 2022 +0100 I may be stoopid commit8182a57feaMerge:754c2d36e42d25fe7155Author: Casey <a.roaming.shadow@gmail.com> Date: Sun Mar 27 14:59:24 2022 -0400 Merge pull request #12545 from BonniePandora/unfucks-engraving Makes engraving no-longer cause rage when trying to cut wires, amongst other things. commit754c2d36e4Merge:ed28fbac1aeb30dfc424Author: Casey <a.roaming.shadow@gmail.com> Date: Sun Mar 27 14:59:10 2022 -0400 Merge pull request #12554 from Heroman3003/amberson Re-enables Amber Slime's feed aura (with restrictions) commited28fbac1aMerge:ebd52c09bf124df67c81Author: Casey <a.roaming.shadow@gmail.com> Date: Sun Mar 27 14:58:25 2022 -0400 Merge pull request #12552 from Heroman3003/xenobio-rework Makes Xenobio Great Again commitc6b6d218b6Author: Foopwo <FBfL4RhPM5453jfr> Date: Sun Mar 27 11:41:18 2022 -0700 Add siphon vent to tether autoresleever room. commitebd52c09bfMerge:87e9349c8ffd4541bf32Author: Casey <a.roaming.shadow@gmail.com> Date: Sun Mar 27 14:40:31 2022 -0400 Merge pull request #12548 from FartMaster69420/micro-holders Micros can be holstered commit87e9349c8fMerge:35d2abd959c230fe12efAuthor: Casey <a.roaming.shadow@gmail.com> Date: Sun Mar 27 14:36:45 2022 -0400 Merge pull request #12550 from Rykka-Stormheart/shep-dev-auto-resleeving-sanity Autoresleever checks for whitelist commiteb30dfc424Author: Heroman <alesha3000@list.ru> Date: Mon Mar 28 04:01:13 2022 +1000 Re-enables Amber Slime's feed aura (with restrictions) commit124df67c81Author: Heroman <alesha3000@list.ru> Date: Sun Mar 27 19:55:54 2022 +1000 Fixes compile commit6be4251096Author: Heroman <alesha3000@list.ru> Date: Sun Mar 27 19:28:12 2022 +1000 Grammar and missed desc/name commit771f3144a9Author: Heroman <alesha3000@list.ru> Date: Sun Mar 27 17:46:38 2022 +1000 Swaps required reagent for hostile mob and random mobs reactions commitc230fe12efAuthor: Rykka <sorren15@gmail.com> Date: Sat Mar 26 23:36:36 2022 -0600 Requested Changes, disables the NO_SCAN check. commit7240d75813Author: Heroman <alesha3000@list.ru> Date: Sun Mar 27 15:21:45 2022 +1000 Adjust descriptions of extract and adds admin logging to some of reactions. commit56849e7a71Author: Heroman <alesha3000@list.ru> Date: Sun Mar 27 14:17:41 2022 +1000 Reworks xenobio extract rewards commita9df95e5d4Author: Pandora <pancake_29@live.co.uk> Date: Sun Mar 27 05:14:01 2022 +0100 Catslugs can into space (#17) * Update catslug.dm * Add files via upload * Add files via upload * Add files via upload * Add files via upload * Add files via upload commit2d25fe7155Author: Pandora <pancake_29@live.co.uk> Date: Sun Mar 27 05:00:40 2022 +0100 Update syringes.dm commita86fba943aAuthor: Rykka <sorren15@gmail.com> Date: Sat Mar 26 21:49:28 2022 -0600 Autoresleever checks for whitelist and if species can be resleeved As it says. Autoresleever will abort the spawn attempt if the client is not whitelisted for the species (as currently one can ghost, select an autoresleever, and spawn via it even on a whitelisted species they don't have access to normally.) Autoresleever will abort spawn attempt for species with NO_SCAN in their flags. This prevents Xenochimera/Proteans/etc from rejoining via Autoresleevers, as per whitelist expectations - Xenochimera even have specific lore stating they contaminate sleevers. These changes will be applied to regular clonepod + resleeving pod eventually™️ commitfd4541bf32Author: FartMaster69420 <78667902+FartMaster69420@users.noreply.github.com> Date: Sat Mar 26 22:47:54 2022 -0400 Atleast holsters work micros dont deconstruct very well commitab3fa99844Author: FartMaster69420 <78667902+FartMaster69420@users.noreply.github.com> Date: Sat Mar 26 22:31:35 2022 -0400 Go ahead Deconstruct 'em commit35d2abd959Merge:69be3b4d64f7e0083409Author: Novacat <35587478+Novacat@users.noreply.github.com> Date: Sat Mar 26 17:27:47 2022 -0400 Merge pull request #12543 from Heroman3003/skillboard Makes board in tech storage not be broken commitbb60734833Author: Pandora <pancake_29@live.co.uk> Date: Sat Mar 26 16:52:16 2022 +0000 Update knives.dm commitddd3137592Author: Pandora <pancake_29@live.co.uk> Date: Sat Mar 26 16:51:40 2022 +0000 Update wirecutters.dm commit3b04c3893fAuthor: Pandora <pancake_29@live.co.uk> Date: Sat Mar 26 16:47:26 2022 +0000 Update screwdriver.dm commitfea7d8c037Author: Pandora <pancake_29@live.co.uk> Date: Sat Mar 26 16:46:32 2022 +0000 Update wall_attacks.dm commit7d3173d539Author: Pandora <pancake_29@live.co.uk> Date: Sat Mar 26 16:44:17 2022 +0000 Update floor_attackby.dm commitf7e0083409Author: Heroman <alesha3000@list.ru> Date: Sat Mar 26 17:26:48 2022 +1000 Makes board in tech storage not be broken commit69be3b4d64Merge:cce944d043ab79b72200Author: Casey <a.roaming.shadow@gmail.com> Date: Sat Mar 26 00:42:55 2022 -0400 Merge pull request #12541 from GhostActual/Firearms1 Did a Whoops commitab79b72200Author: GhostActual <evening.quill103@gmail.com> Date: Sat Mar 26 00:30:28 2022 -0400 Did a Whoops commitcce944d043Merge:4a4deb5b1f7dced2cc17Author: Casey <a.roaming.shadow@gmail.com> Date: Fri Mar 25 23:55:54 2022 -0400 Merge pull request #12522 from GhostActual/Firearms1 Firearms 1 commit4a4deb5b1fMerge:1dad102bf4f4b44186f0Author: Casey <a.roaming.shadow@gmail.com> Date: Fri Mar 25 23:26:12 2022 -0400 Merge pull request #12540 from Very-Soft/accountfornifsandimplants Auto-Resleeving, account for nifsofts and backup implants commit1dad102bf4Merge:9c42204fde76b3645370Author: Casey <a.roaming.shadow@gmail.com> Date: Fri Mar 25 23:18:42 2022 -0400 Merge pull request #12539 from FartMaster69420/slip-nom Slip Vore commitf4b44186f0Author: VerySoft <a.roaming.shadow@gmail.com> Date: Fri Mar 25 23:09:59 2022 -0400 Oops! commitf75676e1f9Author: VerySoft <a.roaming.shadow@gmail.com> Date: Fri Mar 25 22:55:22 2022 -0400 Auto-Resleeving, account for nifsofts and backup implants Now auto-resleeving will give you back whatever nifsofts you downloaded Also it gives you a backup implant. commit76b3645370Author: FartMaster69420 <78667902+FartMaster69420@users.noreply.github.com> Date: Fri Mar 25 22:50:11 2022 -0400 Adding sanity Adds a short timer after being expelled from a belly, during this time frame you cannot be slip nom'd. commit9c42204fdeMerge:05f10ff0d5edd307b0aeAuthor: Casey <a.roaming.shadow@gmail.com> Date: Fri Mar 25 19:10:53 2022 -0400 Merge pull request #12537 from Very-Soft/accountforbrain Auto-Resleever accounts for brains commitedd307b0aeAuthor: VerySoft <a.roaming.shadow@gmail.com> Date: Fri Mar 25 18:58:28 2022 -0400 Auto-Resleever accounts for brains If you click on the auto-resleever while you still have an active synth brain somewhere, it will ask you if you want to delete that brain. This is to prevent harvesting brain parts from dead people or other weirdness for brains getting turned in after they are killed and auto-resleeved. commit05f10ff0d5Merge:8ec89167799ec106f06fAuthor: Casey <a.roaming.shadow@gmail.com> Date: Fri Mar 25 17:18:36 2022 -0400 Merge pull request #12519 from Fracshun/micro-storage Allowing micros to crawl into storage items commit8ec8916779Merge:c7fb215fc85f0e8705daAuthor: Casey <a.roaming.shadow@gmail.com> Date: Fri Mar 25 16:56:46 2022 -0400 Merge pull request #12535 from Very-Soft/findaresleever Find Auto Resleever commitc7fb215fc8Merge:b9176987f908058d6a9aAuthor: Casey <a.roaming.shadow@gmail.com> Date: Fri Mar 25 16:56:34 2022 -0400 Merge pull request #12534 from Verkister/patch-112 Fixes nif unimplant runtime commit5f0e8705daAuthor: VerySoft <a.roaming.shadow@gmail.com> Date: Fri Mar 25 16:13:46 2022 -0400 Find Auto Resleever Adds a ghost verb 'Find Auto Resleever' This picks a random auto resleever somewhere in the world and teleports the ghost to it. commit08058d6a9aAuthor: Verkister <superverkelian@hotmail.com> Date: Fri Mar 25 22:10:31 2022 +0200 Fixes nif unimplant runtime Fixes the proc ending in runtime loop if the human existn'ts commitf79768c837Author: FartMaster69420 <78667902+FartMaster69420@users.noreply.github.com> Date: Fri Mar 25 13:46:21 2022 -0400 Initial Commit commitb9176987f9Merge:b043f178d57292165f6bAuthor: Casey <a.roaming.shadow@gmail.com> Date: Fri Mar 25 06:00:45 2022 -0400 Merge pull request #12533 from Very-Soft/autoresleever Smol fix commit7292165f6bAuthor: VerySoft <a.roaming.shadow@gmail.com> Date: Fri Mar 25 05:43:45 2022 -0400 Smol fix commitb043f178d5Merge:6fd37db4d3b97dbda61fAuthor: Casey <a.roaming.shadow@gmail.com> Date: Fri Mar 25 05:23:08 2022 -0400 Merge pull request #12531 from Heroman3003/getmob Get Mob Adjustment commit6fd37db4d3Merge:0d1873661a661374270aAuthor: Casey <a.roaming.shadow@gmail.com> Date: Fri Mar 25 05:22:41 2022 -0400 Merge pull request #12530 from Heroman3003/suff Fixes vore panel not updating immedeately when setting suffocation damage commit0d1873661aMerge:412f900fb37f3b2c2eb7Author: Casey <a.roaming.shadow@gmail.com> Date: Fri Mar 25 05:22:25 2022 -0400 Merge pull request #12527 from Heroman3003/droppodboom Makes droppods not do quintiple kaboom commit412f900fb3Merge:07c41e63aef95edd3a38Author: Casey <a.roaming.shadow@gmail.com> Date: Fri Mar 25 05:22:00 2022 -0400 Merge pull request #12526 from Heroman3003/slimeaggro Makes slimes not call for help with food or internal disputes commitb97dbda61fAuthor: Heroman <alesha3000@list.ru> Date: Fri Mar 25 18:24:40 2022 +1000 Get Mob Adjustment commit07c41e63aeMerge:2403db18f313e8bf9d8dAuthor: Casey <a.roaming.shadow@gmail.com> Date: Fri Mar 25 03:21:41 2022 -0400 Merge pull request #12529 from Very-Soft/autoresleever Auto-Resleeving commit661374270aAuthor: Heroman <alesha3000@list.ru> Date: Fri Mar 25 17:08:56 2022 +1000 Fixes vore panel not updating immedeately when setting suffocation damage commit13e8bf9d8dAuthor: VerySoft <a.roaming.shadow@gmail.com> Date: Fri Mar 25 02:49:10 2022 -0400 Auto-Resleeving Adds auto-resleeving! Under normal conditions, this allows one to resleeve their character after they have died in the round. The auto-resleever requires a bit of time after death to be used: -Characters who died due to vore reasons must wait 15 minutes -Characters who died for other reasons must wait 30 minutes The auto-resleever only requires power, there is no biomass requirement. The auto-resleever also works for species that can ordinarily not be resleeved, since the potential for abuse there is minimal. To use the auto-resleever, one only needs to click it as a ghost. If it is ready to revive you, it will pop up a confirmation dialogue. Additionally, the automatic transcore notification, and the 'Cancel Transcore Notification' verb has been removed. Ghosts have a 'Notify Transcore' verb, which can be used around 5 minutes after death if they wish to notify medical. This should eliminate false positives for medical, because no one likes resleeving people who don't need it. This does not otherwise alter the original resleeving process or machines. The auto-resleever for the tether is on Z1, just south of the psych office. It also features a return chute for items right next to the door. (I wanted to put it in the resleeving room's cleaning room, but it's really far into medical) The auto-resleever for the stellar delight is in the resleeving's cleaning room. I also fixed the access on the tourbus's APC while I was there. commit7f3b2c2eb7Author: Heroman <alesha3000@list.ru> Date: Fri Mar 25 16:39:32 2022 +1000 Makes droppods not do quintiple kaboom commitf95edd3a38Author: Heroman <alesha3000@list.ru> Date: Fri Mar 25 16:05:45 2022 +1000 Makes slimes not call for help with food or internal disputes commit7dced2cc17Author: GhostActual <evening.quill103@gmail.com> Date: Thu Mar 24 16:35:34 2022 -0400 Base Commit commit9ec106f06fAuthor: Eli Atonis <fracshun@gmail.com> Date: Thu Mar 24 19:31:07 2022 +1100 Allowing micros to crawl into storage items Fixed a bug where a micro player could pick themselves up out of storage items if they used alt+click to open it. This would free them, but create an invisible, empty holder item in their hands which could then be placed in storages. Added the ability for micros (size 25%) and observer mice (size 100% or lower) to drag their sprite over storage items in order to climb inside. Same as if a player were to pick them up and store them. commit2403db18f3Merge:990fb0399e5f54623fbcAuthor: Casey <a.roaming.shadow@gmail.com> Date: Wed Mar 23 23:39:11 2022 -0400 Merge pull request #12518 from FartMaster69420/prommie-blob Adding OOC Notes to Blobs commit5f54623fbcAuthor: FartMaster69420 <78667902+FartMaster69420@users.noreply.github.com> Date: Wed Mar 23 14:43:11 2022 -0400 Adding OOC Notes to blobs Whoops, forgot to do this. Now OOC Notes will be transfered to prommie blobs. As an added bonus, the same functionality was added to protean blobs. Wow! commit990fb0399eMerge:2cf42a9d3825d1bbeba7Author: Casey <a.roaming.shadow@gmail.com> Date: Wed Mar 23 02:35:40 2022 -0400 Merge pull request #12511 from BonniePandora/Unfucks-crafting Fixes the infina-scoped-rifle bug commit2cf42a9d38Merge:1b0bd0d1a351fe2e1450Author: Casey <a.roaming.shadow@gmail.com> Date: Wed Mar 23 02:30:57 2022 -0400 Merge pull request #12515 from Very-Soft/adminverbs Admin Verbs commit51fe2e1450Author: VerySoft <a.roaming.shadow@gmail.com> Date: Wed Mar 23 02:19:28 2022 -0400 Further verb edits commit80ab673771Author: VerySoft <a.roaming.shadow@gmail.com> Date: Wed Mar 23 01:36:04 2022 -0400 Admin Verbs Adjusts Intercom Msg a little Adds Orbit Things verb, which allows staff to more easily orbit things around other things. commit25d1bbeba7Author: Pandora <pancake_29@live.co.uk> Date: Tue Mar 22 17:57:15 2022 +0000 fucky lists
250 lines
8.5 KiB
Plaintext
250 lines
8.5 KiB
Plaintext
|
|
/obj/item/device/integrated_circuit_printer
|
|
name = "integrated circuit printer"
|
|
desc = "A portable(ish) machine made to print tiny modular circuitry out of metal."
|
|
icon = 'icons/obj/integrated_electronics/electronic_tools.dmi'
|
|
icon_state = "circuit_printer"
|
|
w_class = ITEMSIZE_LARGE
|
|
var/metal = 0
|
|
var/max_metal = 100
|
|
var/metal_per_sheet = 10 // One sheet equals this much metal.
|
|
var/debug = FALSE // If true, metal is infinite.
|
|
|
|
var/upgraded = FALSE // When hit with an upgrade disk, will turn true, allowing it to print the higher tier circuits.
|
|
var/illegal_upgraded = FALSE // When hit with an illegal upgrade disk, will turn true, allowing it to print the illegal circuits.
|
|
var/can_clone = FALSE // Same for above, but will allow the printer to duplicate a specific assembly. (Not implemented)
|
|
// var/static/list/recipe_list = list()
|
|
var/obj/item/device/electronic_assembly/assembly_to_clone = null // Not implemented x3
|
|
var/dirty_items = FALSE
|
|
|
|
/obj/item/device/integrated_circuit_printer/all_upgrades
|
|
upgraded = TRUE
|
|
illegal_upgraded = TRUE
|
|
can_clone = TRUE
|
|
|
|
/obj/item/device/integrated_circuit_printer/illegal
|
|
illegal_upgraded = TRUE
|
|
can_clone = TRUE
|
|
|
|
/obj/item/device/integrated_circuit_printer/upgraded
|
|
upgraded = TRUE
|
|
can_clone = TRUE
|
|
|
|
/obj/item/device/integrated_circuit_printer/debug
|
|
name = "fractal integrated circuit printer"
|
|
desc = "A portable(ish) machine that makes modular circuitry seemingly out of thin air."
|
|
upgraded = TRUE
|
|
illegal_upgraded = TRUE
|
|
can_clone = TRUE
|
|
debug = TRUE
|
|
|
|
/obj/item/device/integrated_circuit_printer/attack_robot(mob/user as mob)
|
|
if(Adjacent(user))
|
|
return tgui_interact(user)
|
|
else
|
|
return ..()
|
|
|
|
/obj/item/device/integrated_circuit_printer/attackby(var/obj/item/O, var/mob/user)
|
|
if(istype(O,/obj/item/stack/material))
|
|
var/obj/item/stack/material/stack = O
|
|
if(stack.material.name == MAT_STEEL)
|
|
if(debug)
|
|
to_chat(user, span("warning", "\The [src] does not need any material."))
|
|
return
|
|
var/num = min((max_metal - metal) / metal_per_sheet, stack.get_amount())
|
|
if(num < 1)
|
|
to_chat(user, span("warning", "\The [src] is too full to add more metal."))
|
|
return
|
|
if(stack.use(max(1, round(num)))) // We don't want to create stacks that aren't whole numbers
|
|
to_chat(user, span("notice", "You add [num] sheet\s to \the [src]."))
|
|
metal += num * metal_per_sheet
|
|
attack_self(user)
|
|
return TRUE
|
|
|
|
if(istype(O,/obj/item/integrated_circuit))
|
|
to_chat(user, span("notice", "You insert the circuit into \the [src]."))
|
|
user.unEquip(O)
|
|
metal = min(metal + O.w_class, max_metal)
|
|
qdel(O)
|
|
attack_self(user)
|
|
return TRUE
|
|
|
|
if(istype(O,/obj/item/weapon/disk/integrated_circuit/upgrade/advanced))
|
|
if(upgraded)
|
|
to_chat(user, span("warning", "\The [src] already has this upgrade."))
|
|
return TRUE
|
|
to_chat(user, span("notice", "You install \the [O] into \the [src]."))
|
|
upgraded = TRUE
|
|
dirty_items = TRUE
|
|
attack_self(user)
|
|
return TRUE
|
|
|
|
if(istype(O,/obj/item/weapon/disk/integrated_circuit/upgrade/illegal))
|
|
if(illegal_upgraded)
|
|
to_chat(user, span("warning", "\The [src] already has this upgrade."))
|
|
return TRUE
|
|
to_chat(user, span("notice", "You install \the [O] into \the [src]."))
|
|
illegal_upgraded = TRUE
|
|
dirty_items = TRUE
|
|
attack_self(user)
|
|
return TRUE
|
|
|
|
if(istype(O,/obj/item/weapon/disk/integrated_circuit/upgrade/clone))
|
|
if(can_clone)
|
|
to_chat(user, span("warning", "\The [src] already has this upgrade."))
|
|
return TRUE
|
|
to_chat(user, span("notice", "You install \the [O] into \the [src]."))
|
|
can_clone = TRUE
|
|
attack_self(user)
|
|
return TRUE
|
|
|
|
return ..()
|
|
|
|
/obj/item/device/integrated_circuit_printer/vv_edit_var(var_name, var_value)
|
|
// Gotta update the static data in case an admin VV's the upgraded var for some reason..!
|
|
if(var_name == "upgraded")
|
|
dirty_items = TRUE
|
|
return ..()
|
|
|
|
/obj/item/device/integrated_circuit_printer/attack_self(var/mob/user)
|
|
tgui_interact(user)
|
|
|
|
/obj/item/device/integrated_circuit_printer/tgui_state(mob/user)
|
|
return GLOB.tgui_physical_state
|
|
|
|
/obj/item/device/integrated_circuit_printer/tgui_interact(mob/user, datum/tgui/ui)
|
|
if(dirty_items)
|
|
update_tgui_static_data(user, ui)
|
|
dirty_items = FALSE
|
|
|
|
ui = SStgui.try_update_ui(user, src, ui)
|
|
if(!ui)
|
|
ui = new(user, src, "ICPrinter", name) // 500, 600
|
|
ui.open()
|
|
|
|
/obj/item/device/integrated_circuit_printer/tgui_static_data(mob/user)
|
|
var/list/data = ..()
|
|
|
|
var/list/categories = list()
|
|
for(var/category in SScircuit.circuit_fabricator_recipe_list)
|
|
var/list/cat_obj = list(
|
|
"name" = category,
|
|
"items" = null
|
|
)
|
|
if(cat_obj["name"] == "Illegal Parts" && !illegal_upgraded)
|
|
continue
|
|
var/list/circuit_list = SScircuit.circuit_fabricator_recipe_list[category]
|
|
var/list/items = list()
|
|
for(var/path in circuit_list)
|
|
var/obj/O = path
|
|
var/can_build = TRUE
|
|
|
|
if(ispath(path, /obj/item/integrated_circuit))
|
|
var/obj/item/integrated_circuit/IC = path
|
|
if((initial(IC.spawn_flags) & IC_SPAWN_RESEARCH) && (!(initial(IC.spawn_flags) & IC_SPAWN_DEFAULT)) && !upgraded)
|
|
can_build = FALSE
|
|
|
|
var/cost = 1
|
|
if(ispath(path, /obj/item/device/electronic_assembly))
|
|
var/obj/item/device/electronic_assembly/E = path
|
|
cost = round((initial(E.max_complexity) + initial(E.max_components)) / 4)
|
|
else
|
|
var/obj/item/I = path
|
|
cost = initial(I.w_class)
|
|
|
|
items.Add(list(list(
|
|
"name" = initial(O.name),
|
|
"desc" = initial(O.desc),
|
|
"can_build" = can_build,
|
|
"cost" = cost,
|
|
"path" = path,
|
|
)))
|
|
|
|
cat_obj["items"] = items
|
|
categories.Add(list(cat_obj))
|
|
data["categories"] = categories
|
|
|
|
return data
|
|
|
|
/obj/item/device/integrated_circuit_printer/tgui_data(mob/user, datum/tgui/ui, datum/tgui_state/state)
|
|
var/list/data = ..()
|
|
|
|
data["metal"] = metal
|
|
data["max_metal"] = max_metal
|
|
data["metal_per_sheet"] = metal_per_sheet
|
|
data["debug"] = debug
|
|
data["upgraded"] = upgraded
|
|
data["can_clone"] = can_clone
|
|
data["assembly_to_clone"] = assembly_to_clone
|
|
|
|
return data
|
|
|
|
/obj/item/device/integrated_circuit_printer/tgui_act(action, list/params, datum/tgui/ui, datum/tgui_state/state)
|
|
if(..())
|
|
return TRUE
|
|
|
|
add_fingerprint(usr)
|
|
|
|
switch(action)
|
|
if("build")
|
|
var/build_type = text2path(params["build"])
|
|
if(!build_type || !ispath(build_type))
|
|
return 1
|
|
|
|
var/cost = 1
|
|
|
|
if(ispath(build_type, /obj/item/device/electronic_assembly))
|
|
var/obj/item/device/electronic_assembly/E = build_type
|
|
cost = round( (initial(E.max_complexity) + initial(E.max_components) ) / 4)
|
|
else
|
|
var/obj/item/I = build_type
|
|
cost = initial(I.w_class)
|
|
|
|
var/in_some_category = FALSE
|
|
for(var/category in SScircuit.circuit_fabricator_recipe_list)
|
|
if(build_type in SScircuit.circuit_fabricator_recipe_list[category])
|
|
in_some_category = TRUE
|
|
break
|
|
if(!in_some_category)
|
|
return
|
|
|
|
if(!debug)
|
|
if(!Adjacent(usr))
|
|
to_chat(usr, "<span class='notice'>You are too far away from \the [src].</span>")
|
|
if(metal - cost < 0)
|
|
to_chat(usr, "<span class='warning'>You need [cost] metal to build that!.</span>")
|
|
return 1
|
|
metal -= cost
|
|
var/obj/item/built = new build_type(get_turf(loc))
|
|
usr.put_in_hands(built)
|
|
to_chat(usr, "<span class='notice'>[capitalize(built.name)] printed.</span>")
|
|
playsound(src, 'sound/items/jaws_pry.ogg', 50, TRUE)
|
|
return TRUE
|
|
|
|
// FUKKEN UPGRADE DISKS
|
|
/obj/item/weapon/disk/integrated_circuit/upgrade
|
|
name = "integrated circuit printer upgrade disk"
|
|
desc = "Install this into your integrated circuit printer to enhance it."
|
|
icon = 'icons/obj/integrated_electronics/electronic_tools.dmi'
|
|
icon_state = "upgrade_disk"
|
|
item_state = "card-id"
|
|
w_class = ITEMSIZE_SMALL
|
|
origin_tech = list(TECH_ENGINEERING = 3, TECH_DATA = 4)
|
|
|
|
/obj/item/weapon/disk/integrated_circuit/upgrade/advanced
|
|
name = "integrated circuit printer upgrade disk - advanced designs"
|
|
desc = "Install this into your integrated circuit printer to enhance it. This one adds new, advanced designs to the printer."
|
|
|
|
/obj/item/weapon/disk/integrated_circuit/upgrade/illegal
|
|
name = "integrated circuit printer upgrade disk - illegal designs"
|
|
desc = "Install this into your integrated circuit printer to enhance it. This one adds new, but illegal designs to the printer."
|
|
icon_state = "upgrade_disk_illegal"
|
|
origin_tech = list(TECH_ENGINEERING = 3, TECH_DATA = 4, TECH_ILLEGAL = 1)
|
|
|
|
// To be implemented later.
|
|
/obj/item/weapon/disk/integrated_circuit/upgrade/clone
|
|
name = "integrated circuit printer upgrade disk - circuit cloner"
|
|
desc = "Install this into your integrated circuit printer to enhance it. This one allows the printer to duplicate assemblies."
|
|
icon_state = "upgrade_disk_clone"
|
|
origin_tech = list(TECH_ENGINEERING = 5, TECH_DATA = 6)
|