cyberpresidentvanellope/VOREStation
1
0
Fork 0
mirror of https://github.com/VOREStation/VOREStation.git synced 2026-02-03 12:50:36 +00:00
Code Issues Packages Projects Releases Wiki Activity
57,408 Commits 9 Branches 26 Tags
1de6aa74cf9b9b0caae785f386fc600f2c19d618
Commit Graph

576 Commits

Author SHA1 Message Date
Novacat
ed95d17304 Merge pull request #10176 from Novacat/nova-basicfixes 
Updates Medals (again)
 2021-04-20 18:48:26 -04:00
Unknown
f69d40fc56 Updates Medals (again) 
Astra, Ascian, and Lucky were nominated for a Unity medal as well. This applies it.
 2021-04-20 18:37:48 -04:00
David Winters
d20766da41 fix 2021-04-20 16:53:43 -04:00
Unknown
d7f34c1ce3 Fixes indentation errors 2021-04-20 12:36:46 -04:00
Unknown
2a96ff85a7 More updates 2021-04-20 12:32:58 -04:00
Unknown
c6320456b4 Whitelist Updates 2021-04-18 15:44:24 -04:00
Novacat
724e43cf54 Merge pull request #10147 from dwinters99/cigs 
AlFalah fluff item
 2021-04-12 13:27:32 -04:00
David Winters
2468f31cbb oops 2021-04-11 18:35:31 -04:00
David Winters
e443ea25b0 fluff item 2021-04-11 00:11:53 -04:00
David Winters
8b70c010c6 Merge branch 'master' into cigs 2021-04-10 22:38:54 -04:00
David Winters
7dc38e9650 forgot to change the ckey 2021-04-10 19:11:30 -04:00
David Winters
02bef2c40e fluff item 2021-04-10 03:56:32 -04:00
Aronai Sieyes
4690411915 Remove unnecessary 'signatures' 2021-04-08 12:39:14 -04:00
David Winters
ddf09d50cc cigs 2021-04-05 18:19:58 -04:00
Novacat
fc0ed975c5 Merge pull request #10029 from Very-Soft/morealtids 
MORE ALT ID STUFF
 2021-03-28 19:58:35 -04:00
VerySoft
da6f853210 MORE ALT ID STUFF 
So basically I made one for all the station jobs, and then made one that when you use it, will become whatever job you are when you use it the first time. I added these to the loadout under utility as contractor identification cards!

I also did the same thing for the ITG IDs, but I did not put them on the loadout. People can fluff for them if they want to though! ITG is just a little more stringent in its hiring process than NT is.

I ALSO put in tons of pieces (which I used to make most of these) so that if someone wants to make more of them, or modularize some of them for whatever, they can! There's some alternative icon types and stuff in here too for making IDs for factions that don't exist or whatever! :0

I also removed Harmony's fluff ID and replaced it with the polymorphic ITG ID, since it's effectively the same thing but more generalized.
 2021-03-27 20:55:16 -04:00
Atermonera
c586a83071 Repathed/renamed seromi to teshari. 2021-03-26 15:38:02 -04:00
Heroman
5faf57d8e6 Also refactors them all a lil. 2021-03-24 15:47:10 +10:00
Novacat
7f74202862 Merge pull request #9940 from Meghan-Rossi/talontweaks 
Talon tweaks
 2021-03-13 20:58:53 -05:00
TheFurryFeline
47652a7fff Restore VS edit of tracking implant 
Title.

🆑 
tweak - Fixes tracking implant cost to 0, not 10.
/🆑
 2021-03-13 20:24:44 -05:00
Meghan-Rossi
f716797a7f Talon tweaks 
🆑
rscadd - Added copper to the talon workshop.
rscadd - Added a stunbaton to the talon guard's locker.
rscadd - Talon jobs can now take some role restricted accessories in the loadout.
rscadd - The Talon Pilot laptop now comes with the ship navigation screen preinstalled.
bugfix - Talon can now access their own engi-vend.
tweak - Talon Pilot ids now show the full job title instead of just 'Pilot'.
/🆑
 2021-03-13 21:58:13 +00:00
Unknown
265134ee6a Merge remote-tracking branch 'VOREStation/master' into upstream-merge-7697 2021-03-11 15:04:58 -05:00
David Winters
8cd54d4794 oversized t-shirt + chiton fix 2021-03-11 10:07:24 -05:00
Unknown
213d383c09 Merge remote-tracking branch 'VOREStation/master' into upstream-merge-7697 2021-03-11 10:01:39 -05:00
Novacat
6d032405d8 Merge pull request #9899 from VOREStation/upstream-merge-7966 
[MIRROR] Yet another clothing PR
 2021-03-10 14:40:16 -05:00
Atermonera
a8409a3e1e Yet another clothing PR 2021-03-10 14:30:44 -05:00
Atermonera
13889abe61 Tweaked implant loadout, refactored implant detection. 2021-03-10 14:18:58 -05:00
Schnayy
24435fb1b0 Merge pull request #7849 from Greenjoe12345/teshchair 
Adds some new wheelchair types
 2021-03-09 01:14:49 -05:00
Novacat
dde17fefb2 Merge pull request #9876 from VOREStation/upstream-merge-7953 
[MIRROR] Fixed/generalized loadout implants.
 2021-03-08 11:52:46 -05:00
Novacat
3d7ccffa0c Update loadout_utility.dm 2021-03-08 11:04:02 -05:00
Atermonera
4db820a2da Fixed/generalized loadout implants. 2021-03-08 02:05:32 -05:00
Heroman
5702604b41 Redoes the PR, adds HYPER suit instead 2021-03-08 10:11:10 +10:00
Heroman
2ae3f959b3 gives bluespace jumpsuit a loadout cost. 2021-03-07 14:17:53 +10:00
Heroman
ecb982e6e9 Reworks bluespace suit, adds redspace suit 2021-03-07 14:08:25 +10:00
Unknown
973f183e37 AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA 2021-02-28 16:16:11 -05:00
Unknown
098af65aa7 Adds Smuggler PDA Cartridge 
-Adds Smuggler PDA Cartridge for adminbus
-Adds Bluespace Badge to loadout
 2021-02-28 14:05:46 -05:00
Novacat
3d1ec8ce42 Merge pull request #9540 from VOREStation/upstream-merge-7810 
[MIRROR] Excised Errant Bay Military Lore
 2021-02-13 00:50:25 -05:00
Schnayy
92448560bb Medical Soft/Field Cap 2021-02-12 15:04:06 -05:00
H0lySquirr3l
3d58ac9f05 Update loadout_fluffitems_vr.dm 2021-01-25 13:44:09 -06:00
H0lySquirr3l
dbe94eafb6 Update loadout_fluffitems_vr.dm 2021-01-25 13:39:55 -06:00
Schnayy
3eceda5bb3 fixes some sprites, adds a thin blindfold 2021-01-24 19:34:39 -05:00
Ketrai
ffc4dac425 adds pelts 
ye
 2021-01-10 04:12:53 +01:00
Amy
3752556ceb Fixes mistakes I made adding Verie's fluff items 2021-01-02 21:53:46 -06:00
Cerebulon
4fc2884f9f Excised Errant Bay Military Lore (#7810) 
* Filth + Graffiti Fixes

* Excised Bad Lore

* Update filth.dm

why was this here oops i was on master
 2021-01-01 00:40:56 -05:00
Amy
354eba6ab5 adds fluff skirt outfits to loadout blacklist 2020-12-27 22:19:14 -06:00
VerySoft
92181c24db Harmony fluffstuff 
https://forum.vore-station.net/viewtopic.php?f=45&t=1880
https://forum.vore-station.net/viewtopic.php?f=26&t=1881
it not approved yet but for if/when it gets so
 2020-12-22 22:06:02 -05:00
H0lySquirr3l
612c7fc000 Update loadout_fluffitems_vr.dm 2020-12-11 17:13:18 -06:00
H0lySquirr3l
4894dc0eb6 Add files via upload 2020-12-11 17:03:32 -06:00
Novacat
39fe761eee Merge pull request #9394 from VOREStation/upstream-merge-7760 
[MIRROR] Adds & Upgrades a Bunch of Teshari Clothing
 2020-12-04 15:06:38 -05:00
KasparoVy
fa1c991994 Reverts Most of #9312, Fixes #9394 
Reverts the VR_edit versions of the clothes in PR #9312 and brings Teshari clothing in compliance with Polaris upstream
 2020-12-03 22:40:02 -05:00