Commit Graph
144 Commits
Author SHA1 Message Date
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
PandoraandGitHub 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
PandoraandGitHub 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 SieyesandGitHub 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
Ghost ActualandGitHub 0085a5bd10 Adds more clothing from Polaris and various sources (#11546)
* Base Commit

* Secondary Commit

* Small Addition

* Small Fix

* Yet another Commit

* small fix

* Small Fix

* Small Addition

* More Commit

* I don't know how to stop

* ushanka

* Small Fix

* *aaaaaaa*

* another add-on

* Small Fix

* Revert "Small Fix"

This reverts commit e674b81a0ddee893c6aa2dcdb92040040677351a.

* Conflict Fixes

* Revert "Conflict Fixes"

This reverts commit 1af644bdcab78018aa73525125b32e522d08db41.

* Conflict Fix 2
2021-09-27 14:31:10 -04:00
MistakeNot4892andVirgoBot 0386f03c57 Merge pull request #8293 from Schnayy/toolbelt-change
Adds multitools to roboticist/engi toolbelts
2021-09-12 20:16:05 -04:00
izac112 f3c88225ce Merge branch 'release' of https://github.com/VOREStation/VOREStation into izac 2021-08-29 10:22:30 +02:00
Ghost ActualandGitHub 4bb386e166 Expanding Clothing Options (#11466)
* Base Commit

* Second Commit

* Third Commit

* Fourth Commit

* Fifth Commit

* Sixth Commit

* Seventh Commit

* Final (?) Commit

* Small Fix

* Small Fix

* Merge Fix

* Small Fix

* Additional Goods

* Small Fix
2021-08-26 11:43:44 -04:00
izac112 2aed1cd5c1 Merge branch 'release' of https://github.com/VOREStation/VOREStation into izac 2021-08-20 15:58:41 +02:00
klaasjared 14b342c8c7 Base Commit 2021-08-19 13:15:20 -04:00
izac112 37211d82ba Voreupdate 2021-07-26 09:24:23 +02:00
AtermoneraandVirgoBot 464cada77c Merge pull request #8183 from Cerebulon/hopid
Fixes blank ID sprite for HoP/Secretary
2021-07-25 05:00:46 -04:00
izac112 bc2cf1c838 Merge branch 'izac' of https://github.com/Yawn-Wider/YWPolarisVore; branch 'release' of https://github.com/VOREStation/VOREStation into izac 2021-07-13 10:07:19 +02:00
Aronai Sieyes 421228916e Port lots of new clothes!!! AAAA 2021-07-12 19:05:52 -04:00
izac112 f6878064b3 Merge branches 'izac' and 'izac' of https://github.com/Yawn-Wider/YWPolarisVore; branch 'release' of https://github.com/VOREStation/VOREStation into izac 2021-07-04 22:09:57 +02:00
Aronai Sieyes 414e8c97a3 Add sports bags to outfits 2021-06-28 17:00:41 -04:00
izac112 bcad22ac98 Merge branch 'release' of https://github.com/VOREStation/VOREStation into izac 2021-06-23 19:20:09 +02:00
Aronai Sieyes 85c31e9fda WIP fix of this PR 2021-06-21 19:29:43 -04:00
izac112 0584ab4e6d Merge branch 'release' of https://github.com/VOREStation/VOREStation into izac 2021-06-09 03:17:52 +02:00
Aronai Sieyes 313d082a73 Redoes PR #10581 2021-06-07 14:26:09 -04:00
izac112 e632571d85 Merge branch 'release' of https://github.com/VOREStation/VOREStation into izac 2021-05-31 18:40:44 +02:00
Aronai Sieyes 631ac7756b Fix a typo in detective outfit 2021-05-30 23:46:01 -04:00
izac112 554f907cab Merge branch 'release' of https://github.com/VOREStation/VOREStation into izac 2021-04-12 10:09:54 +02:00
Unknown 1ada358507 Miscellaneous Sundries
- Central jobs now get the expensive emergency box
- Cartridges can now be worn behind the ear.
- BLU-PAK cartridges can be concealed
2021-04-11 12:35:10 -04:00
izac112 0e8bfd43dc Merge branch 'release' of https://github.com/VOREStation/VOREStation into izac 2021-03-24 07:49:59 +01:00
Heroman 362a5129af Adjusts IDs to match vorestation status quo 2021-03-23 18:02:31 +10:00
KillianandVirgoBot 0ec52d3f20 New ID Card Design 2021-03-21 22:29:44 -04:00
Meghan-Rossi 298f4ac98a Pilots get their harness even with loadout uniform
🆑
bugfix - Pilots (inc. Talon Pilots) can now take a loadout uniform without losing their pilot harness
/🆑
The fix from https://github.com/VOREStation/VOREStation/pull/9965 applied to tether and talon pilots instead of just southern cross ones.
2021-03-21 19:05:02 +00:00
izac112 a66821de01 Merge branch 'release' of https://github.com/VOREStation/VOREStation into izac 2021-03-21 09:38:58 +01:00
AtermoneraandVirgoBot cffb1ba66d Merge pull request #7983 from Meghan-Rossi/pilot_tweaks
Fixes pilots not getting a harness if they use a loadout uniform
2021-03-18 04:56:00 -04:00
izac112 3a0b6fbe50 Merge branch 'release' of https://github.com/VOREStation/VOREStation into izac 2021-03-12 07:20:13 +01:00
Little-119 425e5874d1 Make forensic tech spawn without a fedora, either 2021-03-10 16:20:55 -05:00
Little-119 a02f11131f Remove weird helmet thing from Forensic Technician outfit 2021-03-10 15:44:19 -05:00
izac112 5b49bbe887 Merge branch 'release' of https://github.com/VOREStation/VOREStation into izac 2021-02-02 21:56:58 +01:00
Unknown e4b0f292f8 Uplink and Adminverb Tweaks
- Tweaks the proc for Virgo uplink beacons to not give away information about traitors
- Removes the Void Cell from antag uplinks
- Adds a combat defibrillator for Mercenaries
- Adds the cabin shelter capsule to uplinks
- Adds some stuff for admin use of uplinks
- Fixes bug with adminspawn ERT job not getting PDAs
- Adds an admin command to set up an uplink on a character
- Fixes Retired Admin to work properly
- Splits off VORE's adminverb list for improved downstream support
- Fixes retired staff not being able to talk in staff chats
2021-02-02 00:45:28 -05:00