cyberpresidentvanellope/VOREStation
1
0
Fork 0
mirror of https://github.com/VOREStation/VOREStation.git synced 2026-02-04 13:20:15 +00:00
Code Issues Packages Projects Releases Wiki Activity
68,690 Commits 9 Branches 26 Tags
6a78aaa65a4065c1d3a7a8e7ebe22fb949ea22ee
Commit Graph

10406 Commits

Author SHA1 Message Date
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
Heroman3003
8d675e86e7 Merge pull request #16616 from Kashargul/things 
some accessories
 2024-11-28 14:38:12 +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
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
ShadowLarkens
49d0d773e5 Make the microwave preview what it'll (probably) create 2024-11-26 11:12:56 -08:00
C.L.
65c640cd68 Janihud rework 
From Outpost21
 2024-11-26 10:46:05 -05: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
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
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
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
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
Nadyr
5a5c59ac74 makes ashtrays visible in SDMM (#16570) 2024-11-06 14:21:18 +01: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
4879a52633 Server maint subsystem (#16518) 
* upports server maint subsystem

* fix runtime in admin z narrate

* .

* sorts them verbs

* .

* .

* Update code/controllers/subsystems/statpanel.dm

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

* Update code/controllers/subsystems/server_maint.dm

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

---------

Co-authored-by: Selis <12716288+ItsSelis@users.noreply.github.com>
 2024-11-04 11:44:44 +01:00
Kashargul
92c6fc1e5c fix regeneration multipliers (#16561) 
* fix regeneration multipliers

* .

* .
 2024-11-04 11:27:54 +01:00
Kashargul
8c35071d7e prevent out of index access on tgui spamming the rd console (#16552) 
* prevent out of index access on tgui spam

* prevent multi register and unregister

* this needs to be grouped for the execution order
 2024-11-03 19:59:16 +01:00
Guti
c085ef61b9 Fixing (#16549) 2024-11-01 01:36:32 +01:00
Nadyr
f4e2e68a79 Fixes fluid pump (#16541) 2024-10-31 09:29:12 +01:00
Killian
4869595855 ring/watch accessory transfer 2024-10-29 00:23:23 +00:00
ShadowLarkens
9e53689ec7 Replace most legacy robot interfaces with a unified interface (#16517) 2024-10-26 14:17:24 +02:00
ShadowLarkens
dc3fd79427 The final action buttons PR (#16514) 
* Make action button target datum

* Initial working action palette

* Action related refactors

* tgstation/tgstation/pull/71339
 2024-10-26 13:20:54 +02:00
ShadowLarkens
ec18de7d79 Replace all air_master nonsense with SSair 2024-10-23 05:47:09 -07:00
Nadyr
ba998786d7 grindable ores, more grindable stacks, blacklisted slag 2024-10-22 21:19:23 -04:00
ShadowLarkens
5470702370 Even more action button updates (#16510) 
* Update action buttons up to tgstation/tgstation/pull/29379

* Update action buttons up to tgstation/tgstation/pull/48669

* Some dead signals and stuff
 2024-10-22 21:29:42 +02:00
Nadyr
2cd150b294 fixes fireaxe path (#16504) 2024-10-22 20:48:56 +02:00
Selis
242fa3a66b Ports over configuration controller (#16484) 
* Ports over configuration controller

* Fixes

* Manual path fix

* patch (#16490)

* patch

* .

* SQL Fix

* Post-rebase fix

* Added missing examples

---------

Co-authored-by: Kashargul <144968721+Kashargul@users.noreply.github.com>
 2024-10-22 19:26:44 +02:00