cyberpresidentvanellope/VOREStation
1
0
Fork 0
mirror of https://github.com/VOREStation/VOREStation.git synced 2026-02-01 11:52:37 +00:00
Code Issues Packages Projects Releases Wiki Activity
68,763 Commits 8 Branches 26 Tags
edd99b63cf00dabe3e8dec492ddb4b692f6466bf
Commit Graph

6404 Commits

Author SHA1 Message Date
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
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
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
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
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
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
Killian
e016744474 straggler pod: job/role finish 2024-11-27 12:12:03 +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
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
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
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
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
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
ShadowLarkens
bcc107c7cd Ports tgstation/tgstation/pull/15673 (#16495) 
* Ports tgstation/tgstation/pull/15673

* Add a small delay to icon updating to cover up SSoverlays

* Fix actions on robot modules
 2024-10-20 17:12:24 +02:00
Kashargul
40f956a414 some fixes (#16494) 
* some fixes

* module deselect

* .

* .

* .

* .
 2024-10-20 12:10:52 +02:00
Kashargul
b594520a74 next set of spans (#16434) 
* next set of spans

* some more

* next

* next

* next

* .

* text...

* next... rest soon

* .

* .

* ok last set for the night

* .

* .

* .

* .

* some more

* next

* next

* all for now

* .

* some more easy ones

* some more easy ones

* .

* .

* some more bolds

* oups auto complete moment

* add the remaining spans

* this as well

* this as well

* .

* .,

* resync them properly
 2024-10-16 23:37:27 +02:00
ShadowLarkens
c07027136e Port tg statpanel (#16463) 
* Port tg statpanel

* Add verb descriptions using the title attribute

* Fix a dreamchecker error

* Remove chomp edits

* Add mentor tickets to ticket panel

---------

Co-authored-by: Kashargul <144968721+Kashargul@users.noreply.github.com>
 2024-10-16 19:39:06 +02:00
Heroman3003
5afcb29d9c Merge pull request #16445 from TheCaramelion/fixes 
Restores the sounds for all the items
 2024-10-14 05:17:59 +10:00