tommy/tbd-station-14
2
1
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
10,029 Commits 3 Branches 5 Tags
cba8ff270c901b6786980a0d16a0f0ccddae93f9
Commit Graph

364 Commits

Author SHA1 Message Date
Morber
cbfcdde8bd Add screwdriver head sprite (#8828) 2022-06-18 13:42:15 +10:00
TaralGit
0b7d22c168 quickfix (#8942) 
Co-authored-by: and_a <and_a@DESKTOP-RJENGIR>
 2022-06-18 13:20:16 +10:00
Emisse
e4caedf031 Station Specific Jobs: Reporter and Psychologist (#8865) 
* Update jobs.yml

* Add files via upload

* id moment

* Update identification_cards.yml

* Update pda.yml

* Add files via upload

* psych

* roleyml psych

* real

* Update jumpsuits.yml

* Add files via upload

* Add files via upload

* Add files via upload

* Update jobs.yml

* Update meta.json

* Update meta.json

* Update meta.json

* Update bagel.yml

* Update marathon.yml

* job iconz

* Update meta.json
 2022-06-16 19:28:38 +10:00
metalgearsloth
a18ba5c2b5 Power cell culling (#8814) 2022-06-16 18:37:07 +10:00
CrudeWax
c210239f45 Fishy swarmers: Carp content and Space Dragon! (#7395) 
Co-authored-by: mirrorcult <lunarautomaton6@gmail.com>
Co-authored-by: metalgearsloth <comedian_vs_clown@hotmail.com>
Co-authored-by: metalgearsloth <31366439+metalgearsloth@users.noreply.github.com>
 2022-06-16 14:14:06 +10:00
metalgearsloth
dfad885e82 Fix large_casing sprite and cobra mag (#8809) 2022-06-13 19:30:15 +10:00
EmoGarbage404
63fd01f3bb Zombie Rework & Polymorph Expansion (#8413) 
Co-authored-by: Kara <lunarautomaton6@gmail.com>
Co-authored-by: metalgearsloth <31366439+metalgearsloth@users.noreply.github.com>
 2022-06-12 15:53:13 +10:00
TaralGit
43dc0be57c Revamp guns: Revival (#8675) 
Co-authored-by: and_a <and_a@DESKTOP-RJENGIR>
Co-authored-by: metalgearsloth <comedian_vs_clown@hotmail.com>
 2022-06-12 12:39:52 +10:00
ninruB
c41b001ae3 Ore bags! (YAML, RSI) (#8425) 
* Adding orebags hooray

* Adds ore bags to salvage lockers.

* no ic in ooc!!!!! (fixed typo)

i managed to type ic instead of id in the yaml file, real

* deleted the ore bags from cargodrobes, the pr lies!!!

* not 100, not 150, should be 200 next, right?

WRONG!!! 175!!!

* adds orebags to salvage spawn salvage equipment boxes
 2022-06-12 11:57:02 +10:00
Peptide90
79c265efb3 Fixes ID/Names for Sterile masks / latex gloves. Adds nitrile glove box (#8607) 
* fixes box ID/names for mask and gloves. Adds nitrile box

* map update for ID change

* crate fills fix
 2022-06-03 22:05:18 -07:00
Moony
fada213a22 Implements item pricing, and piracy. (#8548) 
* Start implementing item pricing.

* Flesh out prices a bit, add the appraisal tool.

* Add prices to more things.

* YARRRRRRR

* gives pirates an appraisal tool in their pocket.

* Makes the various traitor objectives valuable. Also nerfs the price of a living person, so it's easier to bargain for them.

* Address reviews.

* Address reviews.
 2022-06-03 10:56:11 -05:00
Emisse
c87f4ab65c Holofan Projector Upstream from Nyano (#8352) 
Co-authored-by: metalgearsloth <comedian_vs_clown@hotmail.com>
 2022-06-03 21:58:18 +10:00
Peptide90
8d9b56fce6 Goon floor pack 1 (#8267) 
* floors boxing, arcadeblue2 and carpet clown

* adds gym, metaldiamond and carpetoffice from goon

* adds variants for boxing and gym

* tile variants updated
 2022-06-02 12:10:58 +10:00
metalgearsloth
fb943a61dc Gun refactor (#8301) 
Co-authored-by: Kara <lunarautomaton6@gmail.com>
Co-authored-by: T-Stalker <le0nel_1van@hotmail.com>
Co-authored-by: T-Stalker <43253663+DogZeroX@users.noreply.github.com>
Co-authored-by: ElectroJr <leonsfriedrich@gmail.com>
Co-authored-by: metalgearsloth <metalgearsloth@gmail.com>
 2022-06-01 19:59:58 +10:00
keronshb
11f729d024 Simple Magic Spellbook System (#7823) 
Co-authored-by: metalgearsloth <comedian_vs_clown@hotmail.com>
 2022-05-29 16:29:10 +10:00
efzapa
94b1308f56 Add a BRB Sign (#8437) 2022-05-28 17:09:29 -07:00
Moony
130302a262 Adds twenty-one new smites, moves the explosion smite to the verb category. (#8456) 
* Adds seven new smites, moves the explosion smite to the verb category.

* adds even more smites.

* Even more smites, some messages for specific smites.

* Adds even more smites.

* Removes some junk, adds a smite that angers the pointing arrows.

* get rid of dumb component.

* Remove mistake from verb menu presentation.

* How did that happen?

* whoops

* c

* e

* fuck

* Loading...

* removes the BoM go away

* adds the funny kill sign. Fixes ghost smite.

* Move systems around.

* Adjust organ vomit.

* Adds a smite that turns people into an instrument, and one that removes their gravity.

* oops

* typo

Co-authored-by: Veritius <veritiusgaming@gmail.com>
 2022-05-27 00:41:18 -07:00
Flipp Syder
a8f1ffd435 Mousetraps (#8440) 
Co-authored-by: Kara <lunarautomaton6@gmail.com>
 2022-05-25 13:16:34 -07:00
Emisse
a1b2a9c142 Nuclear Operative Medic (#8274) 
* Update belts.yml

* Add files via upload

* Update hypospray.yml

* Update hypospray.yml

* Update belt.yml

* Update belts.yml

* Add files via upload

* Update misc_startinggear.yml

* Update belts.yml

* Update misc_startinggear.yml

* Update misc_startinggear.yml

* Update belt.yml

* Update duffelbag.yml

* Update duffelbag.yml

* Update misc_startinggear.yml

* Update belts.yml

* Update chemistry-bottles.yml

* Update chemistry-bottles.yml

* Update belt.yml

* Update belt.yml
 2022-05-22 21:32:08 +10:00
Kara
a3decccd35 Immovable rod (#8306) 2022-05-20 19:43:26 -07:00
ZeroDayDaemon
a8937db9e1 Funny dog mug (#8224) 2022-05-18 11:21:38 -07:00
Pieter-Jan Briers
ebfe5e888f Kick mines (real) (#8056) 
Co-authored-by: metalgearsloth <comedian_vs_clown@hotmail.com>
 2022-05-18 14:07:35 +10:00
Veritius
656ec38f99 Add power sinks (#8020) 
Co-authored-by: metalgearsloth <comedian_vs_clown@hotmail.com>
 2022-05-12 23:12:35 +10:00
ZeroDayDaemon
b2792cf3ad Salami Lid (#7813) 
Co-authored-by: metalgearsloth <31366439+metalgearsloth@users.noreply.github.com>
 2022-05-12 20:24:48 +10:00
Pieter-Jan Briers
63b9cd0b92 Adds suppermatter (#7633) 
Co-authored-by: metalgearsloth <comedian_vs_clown@hotmail.com>
 2022-05-12 19:44:17 +10:00
Peptide90
3b54566e5b Changs chinese food vending machine (#7754) 
* new chinese food items from paradise

* made soy sauce salty

* new snacks based on the new assets

* chang assets 1

* chang vending machine

* rsi animation and fix

* rsi path fix

* misc changes

* fortune cookie snacks complete with fortunes

* Update Resources/Prototypes/Entities/Objects/Consumable/Food/snacks.yml

Co-authored-by: ShadowCommander <10494922+ShadowCommander@users.noreply.github.com>

* Update Resources/Prototypes/Entities/Objects/Consumable/Food/snacks.yml

darn Americans

Co-authored-by: ShadowCommander <10494922+ShadowCommander@users.noreply.github.com>

Co-authored-by: ShadowCommander <10494922+ShadowCommander@users.noreply.github.com>
 2022-05-11 00:17:24 -07:00
Kara
4bf0aac814 Rename Assistant to Passenger (#8007) 
Co-authored-by: metalgearsloth <31366439+metalgearsloth@users.noreply.github.com>
Co-authored-by: metalgearsloth <comedian_vs_clown@hotmail.com>
 2022-05-10 13:35:08 +10:00
Emisse
ea498da45d Captain's Antique Laser Gun and Traitor Objective (#7940) 2022-05-09 17:43:36 -07:00
Emisse
c364cbf7a9 Very Important PR That Adds 2 Fountain Pens (#8019) 
* Add files via upload

* Update paper.yml

* Update meta.json

* Update pda.yml

* Update pda.yml
 2022-05-09 15:17:39 +10:00
Kara
8604faab2b Nanotrasen Interns (#8006) 2022-05-08 13:00:00 -07:00
Fishfish458
41f56fa5c8 More bureaucracy - CE stamp, filing cabinets, folder changes (#7816) 
Co-authored-by: fishfish458 <fishfish458>
 2022-05-04 09:22:53 -07:00
Peptide90
d433234fe3 Industrial and Advanced Welders (#7855) 2022-05-02 15:51:24 -07:00
EmoGarbage404
d953f88530 MRE boxes (#7726) 2022-04-30 14:24:37 -07:00
Chris V
94a0bc92b7 Salvage mining, ore processing, and material clean-up (#7406) 
* adding stuff cuz new computer

* removed unused materials

* remove unused materials and such, lathe things

* material volume no longer hardcoded

* fixed mining system

* add 5 stacks of materials, and add them to the ore processor

* fix copyright for ores and handdrill

* comma momma

* whyyyyy

* more fixes to make the yaml linter happy

* i should get my eyes checked

* silver proper

* more cleanup

* leftovers

* remove more references to material doors

* couldn't bear to be without bearhide

* added uranium, added more lathe recipes

* copyright fix, stack fix

* ore processor sprite and such

* ore processing some binches

* MaterialCotton removal

* 1 uranium ore means 1 sheet

* fix merge conflict? idk

* time to ketchup

* lathe recognizes material volume again

* yaml cleanup

* forgot to remove adamantine lol

* re-added diamond for now

* diamond stacks

* functional ore processor

* added ignoreColor to lathe visuals

* ore processor machine board

* add board to industrial tech and circuit printer

* provided lathes their whitelists

* fix wonky ore spawning, added insert sound to lathe, adjusted ore chance

* re-added ore processor

* typos and cleanup

* Update Content.Client/Lathe/LatheSystem.cs

Co-authored-by: metalgearsloth <31366439+metalgearsloth@users.noreply.github.com>

* Update Content.Server/Lathe/LatheSystem.cs

Co-authored-by: metalgearsloth <31366439+metalgearsloth@users.noreply.github.com>

* revert mapchange

* VV ignorecolor, pass entitymanager, move canceltoken to pickaxe, removed foreach from orespawn

* actually null canceltoken

* remove five-stacks, ore processor produces full stacks or single sheets/ingots

* VV proper

* adjust ore chances

* readd Cotton

* Update Content.Server/Mining/MineableSystem.cs

* tweaks

* Material is now dict (material, volume)

* removed unused property

* Space crystal -> space quartz

* forgor asteroid space quartz

Co-authored-by: metalgearsloth <31366439+metalgearsloth@users.noreply.github.com>
Co-authored-by: metalgearsloth <comedian_vs_clown@hotmail.com>
 2022-04-28 20:41:04 +10:00
Veritius
6b78a2a2e4 Syndicate segways (#7790) 2022-04-26 15:08:02 -07:00
Rane
98cd4fdb58 Vehicles (#7336) 2022-04-23 18:05:02 -07:00
Rane
18220b6488 Drains (#7678) 
Co-authored-by: Kara <lunarautomaton6@gmail.com>
 2022-04-23 18:04:49 -07:00
Veritius
ed26cdccee Add a syndicate stamp (#7649) 2022-04-23 17:00:53 -07:00
Snowni
87c618db4b Remote Explosives (#7682) 
* Remote Explosives

* Apparently we forgot to push the changed files. Dumb.

We Forgor.#

* Made Requested Changes.

* And more changes.

* Added requested changes and tweaked a few other things.

* Fixed RSI issue (hopefully.) Readded Ensurecomp.
 2022-04-22 16:54:39 +10:00
ZeroDayDaemon
4926bc7cda Gas Masks, Oxygen Tank Correction, and Correct Fills for lockers and survival boxes (#7589) 
* gas mask and oxy and fills and stuff

* Update masks.yml

* Update masks.yml

* i think this is right

* bag variants fill fix

* syndicate gas mask

* Update emergency.yml
 2022-04-21 22:11:26 +10:00
Ripmorld
cef7d336f2 Flash payload (#7587) 2022-04-20 16:08:57 +10:00
EmoGarbage404
db56d5ef60 Zombies!!! (#7509) 
* wip

* heal on bite

* more fixes and additions

* don't crash

* Update medicine.yml

* zombie claw item and damage resist

* ignoredcomponents.cs

* Add zombie claw, fix infection, add immunities

* fix

* razzle dazzle

* yaml fix

* Update Content.Server/Disease/DiseaseZombieSystem.cs

Co-authored-by: Moony <moonheart08@users.noreply.github.com>

* Update Content.Server/Disease/DiseaseZombieSystem.cs

Co-authored-by: Moony <moonheart08@users.noreply.github.com>

* Update Content.Server/Disease/DiseaseZombieSystem.cs

Co-authored-by: Moony <moonheart08@users.noreply.github.com>

* Update Content.Server/Disease/DiseaseZombieSystem.cs

Co-authored-by: Moony <moonheart08@users.noreply.github.com>

* sdasadsadsadasd

* Generalize DiseaseProgression.cs

* final final final final final final cope seethe

* Update medicine.yml

* Update Content.Server/Disease/Components/DiseaseZombieComponent.cs

Co-authored-by: mirrorcult <lunarautomaton6@gmail.com>

* Update BloodstreamSystem.cs

* Update Content.Server/Disease/Components/DiseaseZombieComponent.cs

Co-authored-by: mirrorcult <lunarautomaton6@gmail.com>

* Update Content.Server/Disease/DiseaseZombieSystem.cs

Co-authored-by: mirrorcult <lunarautomaton6@gmail.com>

* fixing until i die

* folder + zombietransfer fix

* smol fixe

* the smallest of fixes

* aaaa

* Infection timer buff

Co-authored-by: Moony <moonheart08@users.noreply.github.com>
Co-authored-by: mirrorcult <lunarautomaton6@gmail.com>
 2022-04-18 17:30:22 -05:00
Rane
93cdca4f82 Partial lathe ECS, fix cursed lathe visualizer, a bit more audiovisual feedback for lathes (#7238) 
* Prototype that's mostly borked rather than completely borked

* ECS inserting mats

* Partial ECS mostly done, needs cleanup and visualizer

* Replace timers

* Power visualizes at least

* First ""working"" version

* Clean up all lathes

* Colors

* Fix animation timing

* Fixes greyscale, adds a bunch of colors

* Give every (used) material a color

* Made most lathes take long enough you can at least see there's some sort of animation

* Insertion feedback popup

* Sound for circuit printer and uniform printer

* Fix queueing, optimize update

* Remove mono crash

* cleanup

* Fix test failure

* Techfab inserting sprite

* Cleanup and commenting

* Fix bug in CanProduce check

* Fix UI resolves

* Mirror review stuff
 2022-04-17 17:34:14 +10:00
Rane
7a6d3e69a8 Emaggable vendors + Familiars for Chaplain (#6961) 2022-04-17 17:16:02 +10:00
Joosep Jääger
0cdb34741e Airlock visuals (#7261) 2022-04-16 15:31:12 +10:00
Leon Friedrich
a231429cb4 Make energy swords use RgbLightController (#7344) 2022-04-16 15:11:48 +10:00
TaralGit
52ec5036d5 Another gun PR (#7450) 
Co-authored-by: and_a <and_a@DESKTOP-RJENGIR>
 2022-04-15 15:39:16 -07:00
Alex Evgrashin
fe4dbfd2f6 C4 (#7486) 2022-04-14 15:00:50 -07:00
Alex Evgrashin
9c65f4b324 Janitor cart (#7367) 2022-04-11 16:21:15 -07:00
Fishfish458
ddf2d8815b Minor paper ECS and stamps (#7394) 
Co-authored-by: fishfish458 <fishfish458>
 2022-04-08 16:37:22 -07:00