izac112
f3e3905b41
Merge branch 'release' of https://github.com/VOREStation/VOREStation into voreupdate
2024-12-11 20:18:19 +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
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
Killian
c00e6f3d4d
Merge remote-tracking branch 'upstream/master' into kk-charpod
2024-11-27 20:37:02 +00: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
Killian
88408477ec
headset sets
2024-11-25 12:45:52 +00:00
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
c35bb9830a
headset refactor and selection
2024-11-05 11:42:27 +00:00
Kashargul and GitHub
113422b448
.
2024-10-04 18:50:44 +02:00
Guti
06a46a237b
stuff
2024-09-18 18:12:57 +02:00
Guti
f4f5476121
Merge branch 'master' into weapon-removal
2024-09-18 18:07:43 +02:00
Kashargul
7fa41d248f
alt titles and order
2024-09-14 04:20:37 +02:00
Kashargul
b041bca268
some alt titles
2024-09-13 23:00:17 +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
Kashargul
8a3520e2e0
move all factions to defines
2024-09-12 20:17:41 +02:00
Kashargul
10dc8510b3
up to engineer
2024-09-12 02:01:36 +02:00
Kashargul
0425a4e396
up to officer
2024-09-12 00:00:11 +02:00
Guti
409aaba802
Remove
2024-09-09 02:36:53 +02:00
izac112
95279d346e
Merge branch 'release' of https://github.com/VOREStation/VOREStation into voreupdate-515
2024-04-24 23:28:19 +02:00
SatinIsle and GitHub
711f99944e
Entrepreneur Expansion (Part 1) ( #15933 )
...
* [WIP] Entrepreneur Expansion
Added a whole range of unique items and load outs to each entrepreneur alt-title.
Intending to give them some station location too.
* Completes outfit expansion
2024-04-21 21:12:12 +10:00
izac112
f609ac8565
Merge branch 'release' of https://github.com/VOREStation/VOREStation into vore-update
2024-04-02 17:26:31 +02:00
SatinIsle and GitHub
c2263d59ee
Ports "No Shoes" from RogueStar ( #15893 )
...
* Ports No Shoes from RogueStar
Added the ability to choose to spawn with no shoes in character setup. This was ported from RogueStar: https://github.com/TS-Rogue-Star/Rogue-Star/pull/196
* Small fix
2024-04-02 19:10:11 +10:00
SatinIsle and GitHub
7e1ca64167
Merge branch 'master' into entrepreneur-items
2024-03-23 00:29:58 +00:00
SatinIsle
01117743cb
Fixed entrepreneurs losing their PDAs
...
Moves the ticket printer to the left hand, I forgot PDAs were a thing for a moment there.
2024-03-23 00:25:04 +00:00
SatinIsle and GitHub
0a611ae43c
Climbing computers ( #15855 )
...
* entrepreneurs start with permission ticket printer
Added permission ticket printers to entrepreneur's starting loadout.
* Climb on computers
Added the ability to climb onto computers. Like a cat.
2024-03-22 03:29:05 +10:00
SatinIsle
f51ccd91ad
entrepreneurs start with permission ticket printer
...
Added permission ticket printers to entrepreneur's starting loadout.
2024-03-19 23:02:50 +00:00
izac112
eddb283c11
Merge branch 'release' of https://github.com/VOREStation/VOREStation into upstream-update
2023-12-18 03:17:20 +01:00
Killian
e50cbbe56e
pda ringtone pref
2023-11-30 17:38:26 +00:00
izac112
a17d96cb92
Merge branch 'release' of https://github.com/VOREStation/VOREStation into izac
2023-10-30 11:24:00 +01:00
Heroman
ba7b9f46a6
Adds Entrepreneur job, as well as new Entertainer alt-title
2023-09-01 07:43:55 +10:00
izac112
53f54d78e6
Merge branch 'release' of https://github.com/VOREStation/VOREStation into izac
2023-01-03 21:12:41 +01:00
Heroman
0131a9169c
Fixes critical inventory equipment bug
2022-12-24 14:45:09 +10:00
izac112
71d069887c
Merge branch 'release' of https://github.com/VOREStation/VOREStation into izac
2022-07-08 15:49:48 +02:00
Heroman
e70731d417
ALL runtimes
...
ALL runtimes
2022-06-23 18:48:28 +10:00
izac112
068da2c612
Merge branch 'release' of https://github.com/VOREStation/VOREStation into izac
2022-03-22 20:15:54 +01:00
Pandora and GitHub
69f69b5fe0
Update outfit.dm
2022-03-20 17:00:15 +00:00
izac112
37e909fe88
Merge branch 'release' of https://github.com/VOREStation/VOREStation into izac
2022-03-15 20:01:19 +01:00
Pandora and GitHub
a965332861
I'm going to find out if I'm really alive
2022-03-13 08:55:09 +00:00
izac112
aef8a94e94
Merge branch 'release' of https://github.com/VOREStation/VOREStation into izac
2022-02-19 18:19:45 +01:00
klaasjared
8a5afc9d6f
Small Fix
2022-02-17 21:04:05 -05:00
klaasjared
2c312f71a0
Ruin Marine
2022-02-17 21:04:05 -05:00
klaasjared
e8e7bf3990
Toy Guns
...
Toy Guns 2
Toy Guns 3
Toy Guns 4
2022-02-17 21:04:03 -05:00
izac112
a274077bfa
Merge branch 'release' of https://github.com/VOREStation/VOREStation into izac
2021-10-28 21:04:37 +02:00
Aronai Sieyes and GitHub
cc609bdde4
Merge pull request #11589 from VOREStation/upstream-merge-8293
...
[MIRROR] Adds multitools to roboticist/engi toolbelts
2021-10-24 20:04:46 -04:00
izac112
84b075457b
Merge branch 'release' of https://github.com/VOREStation/VOREStation into izac
2021-09-29 23:09:10 +02:00
izac112