Commit Graph

3425 Commits

Author SHA1 Message Date
klaasjared
bc497ca372 Adds EVERYTHING
I never did any other commits so here is all the code stuffs
2021-06-16 02:09:29 -04:00
TheDavestDave
c88c88fe2c stops armour plate and armour plate inserts having the same name, and examine text as each other (#8123)
armour plate and armour plate inserts have the same sprite, name, and examine text in game. I can fix two of  three things. You need to do stuff with amour plate inserts to make it fit in a plate carrier wile amour plate just will never fit
2021-06-11 01:11:21 -04:00
klaasjared
313c3a7a2a Adds in fix and comments
Fixes loadout to include new explo duffle and adds organizational comments to `backpack_vr.dm` to make it look nice.
2021-06-09 06:36:57 -04:00
Aronai Sieyes
313d082a73 Redoes PR #10581 2021-06-07 14:26:09 -04:00
Shadow-Quill
da5a8ea4ef Adds new UI for secure stuff 2021-06-06 05:36:17 -04:00
Aronai Sieyes
59c048ed4b Fixes #10526 2021-06-01 20:50:08 -04:00
Aronai Sieyes
5ac6bd48d9 Ports /tg/ instruments 2021-05-31 19:13:52 -04:00
Novacat
21658b8d85 Merge pull request #10401 from VOREStation/upstream-merge-8075
[MIRROR] Reverts recipe changes from Industrial Expansion
2021-05-27 13:16:06 -04:00
Aronai Sieyes
4cfdd72c02 VS: Strange incorrect code times 2021-05-27 12:07:41 -04:00
Neerti
767e655310 Linter Introduction + Cleanup 2021-05-25 23:19:34 -04:00
Atermonera
e3d239dab9 Merge pull request #8075 from Atermonera/revert_copper_recipes
Reverts recipe changes from Industrial Expansion
2021-05-23 15:41:50 -04:00
Atermonera
7cfd8f3435 Wall-mounted Geiger Counters 2021-05-23 15:40:14 -04:00
ShadowLarkens
4b6ce2af03 Fix only the first RPD ever interacted with working 2021-05-23 02:54:58 -07:00
klaasjared
c380e04b0a Food 4 thought 2021-05-20 23:13:37 -04:00
Aronai Sieyes
29a89cf555 Merge pull request #10335 from VOREStation/Arokha/dels
Various qdel helpers
2021-05-20 15:04:37 -04:00
Killian
02fb5b27e1 Pilot ID & Lockers 2021-05-17 13:47:25 +01:00
Killian
48fb3c6f81 explorer ID addons 2021-05-17 08:37:28 +01:00
Aronai Sieyes
e42547db74 Various qdel helpers 2021-05-15 16:10:08 -04:00
Atermonera
a712cdf5cc Merge pull request #8069 from klaasjared/The-PCU
The Personal Computer Unit
2021-05-10 01:16:43 -04:00
Novacat
76148dfb7d Merge pull request #10257 from Novacat/nova-ert
Changes some Exploration Colors
2021-05-09 17:21:19 -04:00
Aronai Sieyes
2431557ee3 Merge pull request #10178 from dwinters99/light-replacer
New belt items
2021-05-06 13:57:57 -04:00
Unknown
d1437121f2 Merge remote-tracking branch 'VOREStation/master' into personal_crafting 2021-05-06 00:34:56 -04:00
Unknown
0e8a121598 Darkgreen better. 2021-05-05 15:39:28 -04:00
Unknown
85ae7db7e5 Ehh gold is terrible too 2021-05-05 14:32:46 -04:00
Unknown
9c0dd31171 Changes Exploration Color 2021-05-05 13:56:11 -04:00
Atermonera
8d4801b827 Ported the Bay/Nebula emote system. 2021-05-05 12:28:25 -04:00
ShadowLarkens
5c3a8254d0 Fix welding tools and cable coils as tools 2021-05-02 18:30:18 -07:00
ShadowLarkens
1da76ed2b4 Personal Crafting & Dependencies 2021-05-02 18:10:59 -07:00
David Winters
0a5c5d974b nanopaste, spade, light replacer 2021-04-20 18:29:00 -04:00
Novacat
995131f50b Merge pull request #10114 from dwinters99/sord
Captain's Rapier
2021-04-20 12:50:47 -04:00
David Winters
853ed259bf Update misc_vr.dm 2021-04-12 13:12:20 -04:00
Unknown
161354cb2a Fixes Point Defense Batteries 2021-04-11 14:58:12 -04:00
David Winters
25993e8eed Merge branch 'master' into sord 2021-04-11 01:39:38 -04:00
Novacat
ba6a46808d Merge pull request #9800 from VOREStation/upstream-merge-7919
[MIRROR] Hybridizes Point Defense Turrets with Bay's System
2021-04-10 15:17:39 -04:00
Nyks
b4c4d0c9c0 Fixed the conflicts for upstream merge 2021-04-09 20:07:33 +03:00
David Winters
be762a81ed [DNM] holster stuff, doesn't work yet 2021-04-03 22:25:03 -04:00
Novacat
fc0ed975c5 Merge pull request #10029 from Very-Soft/morealtids
MORE ALT ID STUFF
2021-03-28 19:58:35 -04:00
Unknown
c072f96104 Compatibility Fixes 2021-03-28 16:20:09 -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
13c2dcac9c Removes redundant sprite_stack definitions from ID files 2021-03-26 03:53:02 +10:00
VerySoft
09080b6bc2 Adds alternative ID cards!
Uses the event cards to plop in some alternative ID card thingies I made a while back. Maybe use for events, maybe people can use for fluff items! I donno, I just like them so I thought I would plop them in.

I should note, that none of these start with any access or ranks set, and you set that up by using the card in your hand, and then using it on the ID you have access set on.

There's some other card sprites in there too for some other stuff but I didn't figure we'd want those set up like this so! They can be used for adminbus or whatever.
2021-03-25 07:27:00 -04:00
Heroman
f3db65f4f6 coding standards, citadel, use these 2021-03-25 04:38:07 +10:00
Heroman3003
86e723ad36 Merge branch 'master' into idfix3 2021-03-25 04:20:31 +10:00
Heroman3003
07744c3931 un-conflict 2021-03-25 03:07:06 +10:00
Heroman3003
4fe91b1201 un-conflict 2021-03-25 03:06:36 +10:00
Novacat
2604385dcd Update id_stacks.dm 2021-03-24 12:26:29 -04:00
Heroman
fc1d4da50b More fixes for god of fixes 2021-03-24 19:16:23 +10:00
Atermonera
28e200ce68 Patches new ID card code 2021-03-24 05:12:10 -04:00
Heroman
79a54de823 Fixes "" 2021-03-24 17:45:17 +10:00