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

67 Commits

Author SHA1 Message Date
keronshb
cd78c5451d Ensnaring Component and Bola Update (#9968) 2022-08-25 00:50:31 +10:00
Nemanja
79be8258ec circuitry resprite (#10691) 2022-08-19 19:50:18 -07:00
Nemanja
2ccca5a02d Ports machine boards from shiptest (#10682) 2022-08-18 17:10:20 -07:00
Visne
906edc592d Fix/improve smokeables (#10497) 2022-08-13 22:20:31 -07:00
Rane
e36b155325 Port boxer from Nyano (#9080) 2022-07-26 18:34:19 -07:00
Rane
abab5bedcd Port honkbots from nyano (#9698) 2022-07-15 00:54:34 -07:00
ChilbroBaggins
ad46c4669a Textures to make lamps mappable to East/West. (#9414) 
Co-authored-by: Jeff <velcroboy333@hotmail.com>
 2022-07-07 11:47:05 -07:00
Rane
a1affccc84 Miasma improvements (#9022) 2022-06-24 01:20:52 -07: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
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
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
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
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
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
Veritius
ed26cdccee Add a syndicate stamp (#7649) 2022-04-23 17:00:53 -07:00
Fishfish458
ddf2d8815b Minor paper ECS and stamps (#7394) 
Co-authored-by: fishfish458 <fishfish458>
 2022-04-08 16:37:22 -07:00
CrudeWax
f1e6b26b37 ID and Emag retexture + Uplink message bugfix (#7102) 
Co-authored-by: mirrorcult <lunarautomaton6@gmail.com>
 2022-03-20 14:59:50 -07:00
CrudeWax
686780c512 Hypopen (#6826) 
Co-authored-by: mirrorcult <lunarautomaton6@gmail.com>
Co-authored-by: metalgearsloth <31366439+metalgearsloth@users.noreply.github.com>
 2022-03-17 11:46:19 -07:00
mirrorcult
103964ca04 New medium salvage + content for it (#6908) 2022-02-28 19:18:31 -07:00
Chris V
76dfa8ce57 Musician job completeness (#6889) 2022-02-25 22:11:04 -07:00
Fishfish458
5a03f6fa26 Add Energy dagger (#6669) 2022-02-12 21:42:10 +11:00
Fishfish458
997a500fc3 Add inflatable door (#6393) 
Co-authored-by: fishfish458 <fishfish458>
 2022-02-08 14:54:14 -07:00
Lamrr
bec4b66dd8 Adds paper folders (#6228) 2022-01-23 10:46:55 -07:00
CrudeWax
299c4be328 Guardians (Holoparasites) (#5140) 
Co-authored-by: metalgearsloth <31366439+metalgearsloth@users.noreply.github.com>
Co-authored-by: Leon Friedrich <60421075+ElectroJr@users.noreply.github.com>
Co-authored-by: Metal Gear Sloth <metalgearsloth@gmail.com>
 2021-12-29 14:58:48 +11:00
Peptide90
5d15787b04 Copyright purge (#5788) 2021-12-15 13:43:12 +11:00
Mith-randalf
050516c17e Zipties (#5727) 2021-12-13 22:17:26 -07:00
Moony
9075cf6163 Space Kudzu (#5472) 2021-11-28 19:25:36 -07:00
SethLafuente
92209aac9a Added Basic Parts Technology (#4440) 
* Added parts Technology

* is something they're something

bad grammar

* Update Parts.yml

* Update technologies.yml

Co-authored-by: SETh lafuente <cetaciocascarudo@gmail.com>
Co-authored-by: Swept <sweptwastaken@protonmail.com>
 2021-08-23 03:28:37 +00:00
Swept
113cb91411 Adds a 6pack of Cola (#4499) 
* Adds a 6pack of Cola

* Revert "Adds a 6pack of Cola"

This reverts commit 99f024b94ab3c684ce62e28018bd0fe2f26a2e09.

* Revert "Revert "Adds a 6pack of Cola""

This reverts commit 9e3d31e41c8ea61a962ad7d4d3c0ea7124e82653.
 2021-08-20 05:41:17 +00:00
Swept
9d22869e58 Adds a ton more inhands (#4488) 
* Removed useless loc and added inhands for some lamps

* Adds a ton of inhands to the game

* Actually adds the pill inhand

* Update Resources/Textures/Objects/Misc/utensils.rsi/meta.json

Co-authored-by: Paul Ritter <ritter.paul1@googlemail.com>

* Update Resources/Textures/Objects/Tools/rcd.rsi/meta.json

Co-authored-by: Paul Ritter <ritter.paul1@googlemail.com>

Co-authored-by: Paul Ritter <ritter.paul1@googlemail.com>
 2021-08-20 05:36:32 +00:00
Swept
c55f3fd478 Adds mapped storage for lots of entities + a botanical belt (#4342) 
* Cleans up belt stuff and some sprites

* Tag cleanup and sheathed sword

* Adds plant belt for botany chads and maps it's items

* CE belt, will most likely child it to utility instead

* Merges belt_icon and belt_mob into the same RSI

* Cut out alpha layers for wirecutters

* Added lots of equipped-BELT sprites for various items

* Medical, Janitor, Security, Assault, Chief Engineer, Utility and Botany have mapped storage layers

Co-authored-by: metalgearsloth <comedian_vs_clown@hotmail.com>
 2021-07-25 17:21:18 +10:00
Swept
5f9ba812ca Reorganizes Resources/Constructible (#4252) 2021-07-15 18:30:50 +00:00
Swept
6376e60b78 Massive Food PR (#3436) 
Co-authored-by: Pieter-Jan Briers <pieterjan.briers+git@gmail.com>
 2021-05-03 13:17:22 +02:00
Swept
ece403ca57 Copyright Pass/Pruning | Part 2 - Objects (#3905) 2021-04-29 18:09:14 +00:00
SweptWasTaken
0976755eb0 Minor RSI fixes and corgi hide name 2021-04-22 12:11:48 -07:00
ShadowCommander
a98c0dadd4 Implement inflatable wall (#3703) 
* Implement inflatable wall

* Actually block atmos

* Fix naming and add description

* Add requested changes

* Change prototype to field

* Refactor checks to use existing methods

* Fix PrototypeIdSerializer imports

* Fix mass in yaml
 2021-04-01 00:04:56 -07:00
Pieter-Jan Briers
dc11ebf760 Fix all broken RSI files. 2021-03-09 22:06:17 +01:00
Elijahrane
590453a57f Removed most redundant delays in meta.json (#3549) 2021-03-07 20:26:25 +01:00
Swept
a9a96f2edc Crayon balance and reorganize (#3388) 
* Organized and halved crayons write amount

* StackVisualizer for crayon box

* Mime's Crayon

* Gives crayons the write tag

* Applies reviews

* Fuck yo prefixes

* Update fun.yml
 2021-02-27 16:59:20 -08:00
Swept
1056b9005f Fixes Torch (#3270) 
* Updates RSI

* Done

* Finish

* SoulSloth you give me conniptions

* Nvm it was Nuke who made this, sorry soulsloth.

* E

* I am retar
 2021-02-27 10:23:14 +01:00
Swept
4a67fc1d22 Fleshes out smoking content (#3295) 
* RSIs sorted out

* Bookmark

* Updated packet RSIs for Stacks

* Cigs Packs done

* Cigarette Cartons

* fucking MANUALLY fixed the cigarette inhands, fuck you tgstation

* Pipes work

* Cigars/Cases

* Updates vending machine inventory

* tweaks count

* Adds a cigarette crate

* Fixes RSIs, working on rolling paper

* Adds Tobacco and Cannabis plants

* Cigarettes and Rollies are now craftable

* There

* Fixed crafting recipes

* Reset RobustToolbox

* Netsync'd

* Ready

Co-authored-by: DrSmugleaf <DrSmugleaf@users.noreply.github.com>
 2021-02-22 15:08:17 +11:00
Swept
a57db85208 Swept commits JSON genocide. (#2991) 
* Clothing Folder Complete

* All Textures 1st Pass

* All Textures 2nd Pass

* All Textures 3rd Pass PLUS Manual Tweaking

* 5th Pass MORE MANUAL

* Fixes flares

* 4th Pass (I skipped over)

* The 6th Pass (Finality) - With Manual Fixes
 2021-01-13 23:04:38 +11:00
Swept
bfe575b7b6 Random bedsheet spawner. (#2940) 
* Initial

* Optimized YAML

* Probbed

* Updates RSIs

* Maps them into dorms.

* A

* Adds descriptions from TG

* Addressed reviews
 2021-01-11 18:02:36 +11:00
Swept
b44cb0095a Traitor Uplink Content (#2778) 
* Adds syndicate toolbox

* Ancient jumpsuit

* Disk, Extra-bright lantern, syn med/ammo duffels etc.

* Disk sprite fixed

* Final

* Addressed reviews

* Update duffel.yml

Co-authored-by: DrSmugleaf <DrSmugleaf@users.noreply.github.com>
 2020-12-20 00:16:50 +01:00
Swept
740fe65a39 Fixes ID card sprites (#2764) 2020-12-18 11:09:53 +01:00
20kdc
fd0df9a00a Traitor Deathmatch (#2719) 
* Traitor Deathmatch: Add the preset [Rebase onto factors line]

* Traitor Deathmatch: Being a human head or other not-quite-fully-animate object counts as dead. [ROFL]

* Traitor Deathmatch: Add redemption machine (but it doesn't work) [ROFL]

* Traitor Deathmatch: Map in redemption machines [ROFL]

* Traitor Deathmatch: Make the rounds end properly [ROFL]

* Traitor Deathmatch: PDA redemption works [ROFL]

* Traitor Deathmatch: New redemption machine sprite ( @Tomeno )

* Traitor Deathmatch: Get rid of redundant using

* Traitor Deathmatch: Change scoring, prevent redeeming your own PDA, fix bug where PDAs are not tagged with their owner names

* Traitor Deathmatch: Better messages, change cvar name, don't count ghosts for spawnpoint selection
 2020-12-13 16:00:49 +01:00
Peter Wedder
b81b8612b6 Add Botanist, Warden, Quartermaster and Chaplain (#2402) 
* Add Botanist, Warden and Quartermaster

* QM ID card, warden sprite state

* Add missing sprites

* Chaplain + some fixes

* typo fix

* capitalization

* copyrihgght

* add spawnpoints
 2020-10-27 21:28:39 +01:00