Commit Graph

2462 Commits

Author SHA1 Message Date
Killian
2e91c505c3 Update event_vr.dm 2024-12-04 09:28:49 +00:00
Killian
36ddfae1ab Merge branch 'kk-charpod' of https://github.com/KillianKirilenko/VOREStation into kk-charpod 2024-12-04 09:27:16 +00:00
Killian
e937788c58 Update event_vr.dm
fix up spans for the other pods, some other minor adjustments
2024-12-04 09:27:02 +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
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
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
Killian
69a1609848 straggler pod: job/role WIP 2024-11-27 10:37:57 +00:00
Killian
5ab76e74f5 straggler pod: text polish 2024-11-26 18:30:01 +00: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
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
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
Killian
7117658a33 lockpicks (#16580) 2024-11-09 15:41:06 +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
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
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
Killian
4869595855 ring/watch accessory transfer 2024-10-29 00:23:23 +00: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
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
Kashargul
a2c673ab7a refactors most spans 2024-10-02 21:10:31 +02:00
Kashargul
e0d694e8ac rid of old span macros 2024-10-01 23:51:48 +02:00
Guti
f2d6e7c639 Damn recording tapes 2024-09-29 00:14:13 +02:00
Guti
1862c0e11b Deconf 2: Electric Boogaloo 2024-09-27 13:43:21 +02:00
Heroman3003
4f43c44c89 Merge pull request #16368 from Darlantanis/AdvancedMopStorage
Advanced mop no longer devolves when placed in the janitor cart
2024-09-27 21:07:03 +10:00
Nadyr
c280256e28 Advanced mop cart storage 2024-09-25 19:43:21 -04:00
SatinIsle
21bf516fc0 Replicant Species
This PR makes the replicant outsider species a whitelist species after an application was made to play one as a crew member.

Added the Gamma Replicant station species, accessible via whitelist only. This species has additional weaknesses (radiation and shock). They have a few unique organs: The crew version of the rage heart can only activate once every 60 minutes (rather than every minute) but lasts for 40 seconds. The mending lungs repair a few organs very very slowly, instead of extremely quickly. The plasma sac generates plasma a little faster without added phoron.

Changed ventcrawl to specifically allow replicants to take underclothes and pocket sized items with them. I've balanced this for replicants only, but could remove the species check if wanted.

Changed alien and resin structures so that they can also be destroyed by replicants (though more slowly than aliens).

Added the user to the whitelist as approved here: https://forum.vore-station.net/viewtopic.php?f=45&t=2448&p=14179#p14179
2024-09-22 10:30:14 +01:00
Guti
f4f5476121 Merge branch 'master' into weapon-removal 2024-09-18 18:07:43 +02:00
Kashargul
a123f87e68 some mind jobs 2024-09-12 23:48:31 +02:00
Kashargul
8a90ae6523 only missing alt titles 2024-09-12 22:48:14 +02:00
Kashargul
4ba7beeb9c up to field medic 2024-09-12 21:20:47 +02:00
Guti
409aaba802 Remove 2024-09-09 02:36:53 +02:00
ShadowLarkens
e9ee57df18 Revert "Revert "/tg/ preference datums part 1: take two"" 2024-09-07 23:58:49 -07:00
ShadowLarkens
02410abcf3 Revert "/tg/ preference datums part 1: take two" 2024-09-07 23:17:16 -07:00
ShadowLarkens
f9052dbb60 Revert "Merge pull request #16240 from ShadowLarkens/revert"
This reverts commit 885171f985, reversing
changes made to 3e314f8064.
2024-09-07 14:11:15 -07:00