Commit Graph

3407 Commits

Author SHA1 Message Date
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
Heroman 5faf57d8e6 Also refactors them all a lil. 2021-03-24 15:47:10 +10:00
Heroman 5ad1c15b98 Fixes Fluff and ITG ID cards 2021-03-24 15:17:45 +10:00
Heroman 8d8000f84d Fixes gold IDs somehow having forgotten the sprites 2021-03-24 06:59:36 +10:00
Heroman 362a5129af Adjusts IDs to match vorestation status quo 2021-03-23 18:02:31 +10:00
Novacat a770ab4f7e Update syndicate_ids.dm 2021-03-22 01:37:43 -04:00
Killian 0ec52d3f20 New ID Card Design 2021-03-21 22:29:44 -04:00
MistakeNot4892 37717fe7b2 Tachikoma tweaks. (#7988)
* Fixes erroneous copypaste in tachikoma join string.

* Nerfs tachikoma speed.

* Nerfs tachikoma armour.

* Added wirecutters and welder to recon platform kit.

* Swaps the explo platform chainsaw to emag item, gives them a machete instead.

* Prevents ghosts from mousedropping crates onto platforms.
2021-03-19 05:04:00 -04:00
BillyBangles 1b3e00be7e Makes custom cigarettes even more custom-ier (#7925)
* can now add multiple items to rolling papers

* adds blunt wraps and blunts

* un-scuffs the scuffed code
more scuffed up than a wooden middle school gym floor after a dodgeball game

* further optimization
2021-03-19 03:22:19 -04:00
Atermonera 20f4ff8384 Added think-tanks. 2021-03-18 04:09:42 -04:00
Unknown 213d383c09 Merge remote-tracking branch 'VOREStation/master' into upstream-merge-7697 2021-03-11 10:01:39 -05:00
Atermonera 13889abe61 Tweaked implant loadout, refactored implant detection. 2021-03-10 14:18:58 -05:00
Atermonera 02d8653734 Merge pull request #7949 from Meghan-Rossi/e-cig
E-cigarette improvements
2021-03-10 13:51:46 -05:00
Unknown e1d7458624 Merge remote-tracking branch 'VOREStation/master' into upstream-merge-7919 2021-03-09 19:32:09 -05:00
Unknown 190b805cad this sucks 2021-03-09 15:49:07 -05:00
Novacat 465b3ed92f Merge pull request #9869 from VOREStation/upstream-merge-7921
[MIRROR] Adds a modular armour version of the explorer suit and adds sprites to specialist armour
2021-03-09 15:16:52 -05:00
Atermonera 4db820a2da Fixed/generalized loadout implants. 2021-03-08 02:05:32 -05:00
FenodyreeAv efd319c851 Adds a modular armour version of the explorer suit and adds sprites to specialist armour 2021-03-07 15:37:53 -05:00
Heroman 34e78e477d Removes outdated comments 2021-03-07 06:12:38 +10:00