2929 Commits

Author SHA1 Message Date
izac112 f3e3905b41 Merge branch 'release' of https://github.com/VOREStation/VOREStation into voreupdate 2024-12-11 20:18:19 +01:00
Heroman3003 9941ffa8dc Merge branch 'master' into areaStuff 2024-12-07 05:14:52 +10:00
Heroman3003 146c3f4140 Merge pull request #16659 from TheCaramelion/Viro-Update-1
Virology Update 1
2024-12-07 05:06:20 +10:00
Heroman3003 edd99b63cf Merge pull request #16639 from KillianKirilenko/kk-charpod
"Maint Lurker" Hole
2024-12-07 05:05:22 +10:00
ShadowLarkens 9a940834b4 Enable creation of cycling airlocks 2024-12-04 13:45:19 -08:00
Kashargul 4d7255c709 . 2024-12-04 22:45:00 +01:00
Kashargul ead0180057 converts area vars to flags 2024-12-04 22:21:38 +01:00
izac112 68e5bf9d42 Merge branch 'release' of https://github.com/VOREStation/VOREStation into voreupdate-2 2024-12-04 15:21:21 +01:00
izac112 87ce13b27c Merge branch 'release' of https://github.com/VOREStation/VOREStation into voreupdate-2 2024-12-04 15:17:00 +01:00
Killian 01813cd4d0 maint lurker setup 2024-12-04 12:22:40 +00:00
Killian 001afdfbc5 Merge branch 'master' into kk-charpod 2024-12-04 09:25:02 +00:00
izac112 a2ad915045 Device and weapon 2024-12-01 00:56:26 +01:00
izac112 058f219cb9 Merge branch 'release' of https://github.com/VOREStation/VOREStation into voreupdate 2024-11-30 23:30:26 +01:00
Guti 7ead0b1061 Fix 2024-11-30 17:08:32 +01:00
Guti 3cf6aa9f2a Size stuffs 2024-11-30 17:06:02 +01:00
Heroman3003 a15578d8fd Merge pull request #16597 from Kashargul/miscGripper
up ports misc gripper, gargoyle, petrification, some message fixes
2024-11-30 14:41:36 +10:00
Guti 823db69af5 Merge branch 'master' into Viro-Update-1 2024-11-29 22:56:42 +01:00
Heroman3003 10de4fc09f Merge pull request #16511 from VOREStation/verb-subsystem
Verb manager subsystem & Speech controller
2024-11-28 14:43:53 +10:00
Kashargul 938ab8af7c Merge branch 'master' of github.com:Kashargul/VOREStation into usr-to-user-up-to-player_effects 2024-11-27 23:53:06 +01:00
Killian c00e6f3d4d Merge remote-tracking branch 'upstream/master' into kk-charpod 2024-11-27 20:37:02 +00:00
Heroman3003 6f020343bb Merge pull request #16650 from Heroman3003/thanksgivingturkey
Adds a turkey mob and reworks regular Turkey recipe
2024-11-28 05:53:12 +10:00
Heroman 0b10e7770b Adds a turkey mob and reworks regular Turkey recipe 2024-11-28 05:35:09 +10:00
Heroman3003 26e1333b3a Merge pull request #16644 from KillianKirilenko/kk-headsets
Headset Option Fixes
2024-11-28 05:30:32 +10:00
Guti 7668ef66ce Cough & Sneeze 2024-11-27 18:05:05 +01:00
Killian e016744474 straggler pod: job/role finish 2024-11-27 12:12:03 +00:00
Killian 69a1609848 straggler pod: job/role WIP 2024-11-27 10:37:57 +00:00
Guti 7af9d30e36 Few more stuff 2024-11-26 00:23:25 +01:00
Guti 2e9e1806cc Needs all cures set to false 2024-11-25 18:27:41 +01:00
Guti 58455f037c Board 2024-11-25 18:26:55 +01:00
Guti fc4de336fe Fixes 2024-11-25 17:10:24 +01:00
Guti 9f52fc0b1c Sick stuff 2024-11-25 17:05:54 +01:00
Killian 88408477ec headset sets 2024-11-25 12:45:52 +00:00
Guti 6552b55a8b Fix 2024-11-22 01:26:17 +01:00
Guti 61d13fd4ff Spelling mistakes 2024-11-21 00:20:38 +01:00
Guti e123df8cdc Fixes 2024-11-21 00:00:05 +01:00
Heroman3003 8af7a35009 Merge pull request #16603 from Mattjpark89/master
Add Engineering Drake to plushies crate
2024-11-17 21:00:28 +10:00
Heroman3003 47469a1c2d Merge pull request #16539 from KillianKirilenko/kk-rings
Ring/Watch Accessory Transfer
2024-11-17 20:53:14 +10:00
JParker890 35c9c2bf44 Add Engineering Drake to plushies crate 2024-11-14 21:13:50 -07:00
Guti 57ac142d1e Fixes (#16596) 2024-11-13 18:26:00 +01:00
Kashargul 32c9f971bc tgui usr to ui.user 2024-11-13 00:49:17 +01:00
Kashargul d1b6b8a6ca adds petrification 2024-11-12 19:43:48 +01:00
Kashargul 49d89c0059 usr to user up to player effects 2024-11-12 00:10:20 +01:00
Guti d2b4730c31 Virology Patch 2 (#16592)
* Fixes

* Fix

* Macrophage

* oops
2024-11-11 12:59:22 +01:00
Killian e6eb45f910 Merge remote-tracking branch 'upstream/master' into kk-rings 2024-11-08 10:50:04 +00:00
Killian 9fff34e6ad attachable knuckledusters and force transfer 2024-11-07 03:06:56 +00:00
Killian 2c11b12814 Headset Refactor and Selection (#16568)
* headset refactor and selection

* Update headset.dm

formatting

* Update code/modules/client/preference_setup/general/04_equipment.dm

Co-authored-by: Selis <12716288+ItsSelis@users.noreply.github.com>

* Update code/_helpers/global_lists.dm

Co-authored-by: Selis <12716288+ItsSelis@users.noreply.github.com>

* Update code/modules/client/preference_setup/general/04_equipment.dm

Co-authored-by: Selis <12716288+ItsSelis@users.noreply.github.com>

* Update code/modules/client/preference_setup/general/04_equipment.dm

Co-authored-by: Selis <12716288+ItsSelis@users.noreply.github.com>

* Update code/modules/client/preference_setup/general/04_equipment.dm

Co-authored-by: Selis <12716288+ItsSelis@users.noreply.github.com>

* Update code/modules/client/preference_setup/general/04_equipment.dm

Co-authored-by: Selis <12716288+ItsSelis@users.noreply.github.com>

---------

Co-authored-by: Selis <12716288+ItsSelis@users.noreply.github.com>
2024-11-06 18:49:11 +01:00
Killian 90497326d6 Merge branch 'master' into kk-rings 2024-11-06 14:58:43 +00:00
Killian 1cd571ce8f More small hacktool tweaks (#16571)
* mini hacktool expansion

* hacktool tweaks

* Update contraband.dm
2024-11-06 14:20:42 +01:00
Guti 9077c940c4 Better Viro (#16536)
* Better Viro

* Quarantine ship

* Lazy...

* Roanoake prep

* Roanoake

* Verbs

* Verbs + Logging

* Virus breath check
2024-11-05 12:40:02 +01:00
Kashargul a1576977cc Robot upgrades (#16481)
* initial

* variable cell durability and hp increase on upgrades

* cell hp

* cell influences components

* set defaults for most

* value tgui

* .

* .

* .

* fix copy typoes

* also this

* .

* sanity that

* .
2024-11-04 21:12:31 +01:00