Commit Graph

10976 Commits

Author SHA1 Message Date
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
Heroman3003 96cd99127a Merge pull request #16618 from ShadowLarkens/ui
Kitchen UI Update
2024-11-30 14:41:27 +10:00
Heroman3003 90dc2821e9 Merge pull request #16649 from ShadowLarkens/microwave_improvemenets
Make the microwave preview what it'll (probably) create
2024-11-30 14:40:36 +10:00
Guti 823db69af5 Merge branch 'master' into Viro-Update-1 2024-11-29 22:56:42 +01:00
Kashargul 07958d0657 Merge branch 'master' into protRig 2024-11-28 15:57:44 +01:00
Heroman3003 8d675e86e7 Merge pull request #16616 from Kashargul/things
some accessories
2024-11-28 14:38:12 +10:00
Kashargul 2fdde73d3a Merge branch 'master' into protRig 2024-11-27 23:58:52 +01: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 05b28bac9e Merge pull request #16647 from Cameron653/Janihud-OP
Ports Janihud rework from Outpost 21.
2024-11-28 06:05:21 +10: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
Cameron Lennox da88e49778 Enables hud variant 2024-11-27 14:52:17 -05:00
Heroman 076d944576 Last minute typo fix 2024-11-28 05:39:13 +10:00
Heroman 0b10e7770b Adds a turkey mob and reworks regular Turkey recipe 2024-11-28 05:35:09 +10:00
Heroman3003 fa5a178010 Merge pull request #16515 from ShadowLarkens/zas
Some ZAS tweaks and minor optimizations
2024-11-28 05:34:47 +10:00
Heroman3003 8f061174aa Merge pull request #16630 from Kashargul/clamps
surgery firstaid bags can carry bone clamps
2024-11-28 05:28:53 +10:00
Heroman3003 b6486dc686 Merge pull request #16626 from SatinIsle/bed-flip
Flippable beds and sheets
2024-11-28 05:28:33 +10: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
ShadowLarkens 49d0d773e5 Make the microwave preview what it'll (probably) create 2024-11-26 11:12:56 -08:00
Killian 5ab76e74f5 straggler pod: text polish 2024-11-26 18:30:01 +00:00
C.L. 65c640cd68 Janihud rework
From Outpost21
2024-11-26 10:46:05 -05:00
Guti 7af9d30e36 Few more stuff 2024-11-26 00:23:25 +01:00
Guti 58455f037c Board 2024-11-25 18:26:55 +01:00
Killian 353d53a385 straggler pod: prevent whitelist bypass 2024-11-24 08:47:52 +00:00
Killian 9b55d89a8e maint straggler hole 2024-11-24 07:05:19 +00:00
Kashargul bc8d817ed3 surgery firstaid bags can carry bone clamps 2024-11-22 00:01:04 +01:00
Guti 61d13fd4ff Spelling mistakes 2024-11-21 00:20:38 +01:00
Kashargul 635cabdd69 . 2024-11-20 22:06:02 +01:00
Kashargul c0321536be . 2024-11-20 21:24:46 +01:00
Kashargul cff4de9cb2 . 2024-11-20 21:19:33 +01:00
SatinIsle 8b2c766db5 span_notice 2024-11-20 13:11:44 +00:00
SatinIsle 765181b19b Flippable beds and sheets
Added a verb to beds, bedsheets and sub-objects to allow them to be flipped to face the opposite direction (if they have directional sprites available). This applies to chairs too, because why not. If it's possible for me to just not display the verb for non-flippable subtypes, let me know how!

Also swaps out some beds on the Stellar Delight to face the other direction so that their pillows are against the wall.
2024-11-20 13:07:48 +00:00
ShadowLarkens 4c9f046e6d Update the radial menu system to tg latest 2024-11-18 05:48:57 -08:00
Kashargul a5e910bfd2 makes no more sense otherwise 2024-11-17 23:57:06 +01:00
Heroman3003 8d24db7be4 Merge pull request #16512 from Darlantanis/OreGrinding
Ports grindable ores
2024-11-17 20:58:33 +10:00
Heroman3003 edb46d85c2 Merge pull request #16589 from Kashargul/moduleSelectionUI
Moving robot module and icon selection to tgui
2024-11-17 20:54:08 +10:00
Kashargul 607614e217 Merge branch 'master' into protRig 2024-11-12 20:35:51 +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
Kashargul ba9b3e3676 include renaming 2024-11-11 08:53:52 +01:00
Killian 44f643b13d Merge remote-tracking branch 'upstream/master' into kk-rings 2024-11-10 15:12:24 +00:00
Kashargul 6c8fa2dba1 maptest redgate (#16579)
* maptest redgate

* .

* .

* .

* .

* .
2024-11-09 15:42:44 +01:00
Killian 7117658a33 lockpicks (#16580) 2024-11-09 15:41:06 +01:00
Kashargul 8557359c75 refactors chameleon projector (#16582) 2024-11-09 15:38:16 +01:00
SatinIsle b7d77d7245 Hammers for hurting people (#16569)
* Hammers for hurting people

Added a new dark variant of the squish hammer that breaks every bone in the targets body and shoots out blood. Unfortunately they will become unsquished when they fall over, but still gets a nice initial squeeze!

Added a simple claw hammer weapon that I have plans for in an upcoming event. Strong melee weapon that easily breaks down windows and barricades, but also has a high chance of breaking any bones that it hits.

* Just a friendly little warning to my fellow staff :)
2024-11-09 15:36:15 +01:00
Killian 887700472d Syndicate Headset Icons (#16578)
* Update headset.dm

* syndie headset fixes

* Update radio_vr.dmi
2024-11-09 02:00:52 +01:00
SatinIsle e784285462 Fixed virology themed redgate maps (#16577)
* Fixed virology themed redgate maps

Added 4 new props based on the old virology machines for decoration.

Fixed the missing virology equipment in the city and facility redgate maps.

* Update facility.dmm
2024-11-09 02:00:05 +01:00
Guti 7175a48c8d Virology Patch 1 (#16581)
* Update

* Small oopsies
2024-11-09 01:18:07 +01:00
Killian e6eb45f910 Merge remote-tracking branch 'upstream/master' into kk-rings 2024-11-08 10:50:04 +00:00