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

1284 Commits

Author SHA1 Message Date
Rane
aeb1df98b9 Added Lingzhi and Ambrosia Vulgaris (#6464) 2022-02-07 12:43:21 -07:00
Alex Evgrashin
617f92df65 More xeno artifacts effects (#6282) 2022-02-06 19:26:10 -07:00
ScalyChimp
3c9328ff99 Adds portable flasher (#4523) 
Co-authored-by: Paul Ritter <ritter.paul1@googlemail.com>
Co-authored-by: metalgearsloth <comedian_vs_clown@hotmail.com>
Co-authored-by: metalgearsloth <31366439+metalgearsloth@users.noreply.github.com>
 2022-02-07 02:59:41 +11:00
WlarusFromDaSpace
11eb591c54 Adds door remotes from SS13 (#6335) 2022-02-06 00:33:24 +11:00
Rane
be867fc3a0 Added Poppies and Aloe (#6456) 2022-02-04 16:17:05 -07:00
Fishfish458
fe6d2768d2 Add handheld crew monitor (#6404) 
Co-authored-by: fishfish458 <fishfish458>
 2022-02-04 14:17:16 -07:00
Rane
8070fce5e7 Gives Chaplain their Bible 🙏 (#6269) 2022-01-31 02:20:22 +11:00
ScalyChimp
004c678853 Incediary Shells (#6208) 
Co-authored-by: metalgearsloth <31366439+metalgearsloth@users.noreply.github.com>
 2022-01-31 00:44:45 +11:00
Peptide90
7de1953c4c replaced nuka cola with nuclear cola (#6379) 2022-01-30 18:10:15 +11:00
Plasmaguy
cee179d078 Root beer, ice cream, and root beer floats (#6334) 2022-01-27 18:33:27 +11:00
Lamrr
83e568b4be Adds red phone. (#6318) 2022-01-26 10:27:03 -07:00
ScalyChimp
e6f2239afe Pirate guns (#6200) 
Co-authored-by: mirrorcult <lunarautomaton6@gmail.com>
 2022-01-27 00:01:18 +11:00
Júlio César Ueti
6d5eee0d4c Add ESwords (now Inventory refactor compliant!) (#6000) 
Co-authored-by: metalgearsloth <comedian_vs_clown@hotmail.com>
 2022-01-24 23:55:48 +11:00
Peptide90
06bd086ba5 Fix for slime butchering into human meat (#6292) 2022-01-24 23:46:43 +11:00
Lamrr
bec4b66dd8 Adds paper folders (#6228) 2022-01-23 10:46:55 -07:00
Lamrr
27c16edb54 Adds shotgun shell boxes (#6195) 2022-01-22 13:47:54 -07:00
Alex Evgrashin
8d6565ea42 Xenoarchaeology artifacts (#6069) 
Co-authored-by: Alexander Evgrashin <evgrashin.adl@gmail.com>
 2022-01-22 23:55:11 +11:00
Demetre Beroshvili
facb2ea849 Added Checkers (#6219) 2022-01-18 16:44:24 -07:00
Leon Friedrich
5dbe7be294 Fix on-collide explosive collisions (#6186) 2022-01-18 19:26:21 +11:00
keronshb
2a70ba88f7 Adds bola and a crafting recipe for them. (#6185) 2022-01-17 12:21:57 -07:00
Lamrr
8f51cc3344 Adds new pAI sprites (#6205) 2022-01-17 12:21:40 -07:00
Zymem
5e1477c91a Adds briefcase (#6196) 
Co-authored-by: mirrorcult <lunarautomaton6@gmail.com>
 2022-01-17 12:21:28 -07:00
Rane
053674645a Added Syndicate Smokes (#6149) 
* Added Syndicate Smokes

* Removed BOM (maybe?)
 2022-01-13 17:06:31 -08:00
Lamrr
44d849d3f6 (Re)adds captain's sabre (#6101) 2022-01-11 17:50:10 +11:00
Michael Phillips
b36c9395d6 Additional Hydroponics vegetables - Chili + Recipes (#5966) 2022-01-05 00:51:22 +11:00
mirrorcult
72dcef4203 Reduce locker/crate hp and resistances, add spear wielding (#6001) 2022-01-03 10:53:09 +01:00
metalgearsloth
e5e144d99c Rollerbeds (#5681) 2021-12-29 15:57:20 +11: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
TaralGit
887f667376 Deleting the old laser gun and replacing it with the COG (#5664) 
Co-authored-by: and_a <and_a@DESKTOP-RJENGIR>
 2021-12-24 23:32:03 +11:00
Fishfish458
16d96c9dcc Add backgammon and board game crate (#5884) 
* [ADD] backgammon, made pieces generic

* [ADD] board game crate

* [REMOVE] minor whitespace

* Fix BOM

* [CHANGE] feedback changes, condensed backgammon setup

* [CHANGE] swapped backgammon y positions to correct ones

Co-authored-by: fishfish458 <fishfish458>
Co-authored-by: Visne <39844191+Visne@users.noreply.github.com>
 2021-12-24 13:20:20 +01:00
Paul
9b3fe590cf adds proper attribution for pondering orb 2021-12-23 11:38:49 +01:00
Pancake
2f6f2d0936 Orb (#5873) 2021-12-23 11:33:55 +01:00
Mith-randalf
916d9e1e23 Lighters (#5836) 
Co-authored-by: Paul Ritter <ritter.paul1@googlemail.com>
 2021-12-21 18:20:32 +01:00
Peptide90
5d15787b04 Copyright purge (#5788) 2021-12-15 13:43:12 +11:00
Flipp Syder
c0bfe43a05 Adds T-ray Scanners (#5420) 2021-12-14 18:46:47 +11:00
Mith-randalf
050516c17e Zipties (#5727) 2021-12-13 22:17:26 -07:00
shaeone
43eb542a60 Added a decorated fir tree and a present (#5694) 
* Added a decorated fir tree and a present

* Update meta.json of the tree

* Update Resources/Prototypes/Entities/Structures/Decoration/decorated_fir_tree.yml

Co-authored-by: Leon Friedrich <60421075+ElectroJr@users.noreply.github.com>

* Present PNGs changed

Co-authored-by: Leon Friedrich <60421075+ElectroJr@users.noreply.github.com>
 2021-12-13 13:21:15 -08:00
AJCM-git
380f5d77f3 More tiles and some cleanup (#5608) 2021-12-11 16:08:33 -07:00
Elijahrane
2f130e5586 Nettles (#5641) 2021-12-04 11:55:04 -07:00
Moony
9075cf6163 Space Kudzu (#5472) 2021-11-28 19:25:36 -07:00
Spartak
b06becaf98 Adds pills type selection and pills canister (#5539) 
* Added pill type selection

Ui textures missing for now

* bugfixes

* Pill type selection

* ui changes

* Added pills canister

* Change requests
 2021-11-26 23:44:36 -07:00
TaralGit
e5bf2192cf New Guns (hopefully no conflicts this time) (#5105) 
* New Guns (hopefully conflict free)

* solving conflicts

* forgot to delete old laser gun png

* Revert "forgot to delete old laser gun png"

This reverts commit 6273aff7a411f24484fdbde0757446ab7ab5f873.

* small corrections

* carbine

* uplink correction

* cog meta.json correction

* replace laser pistol

* svalinn inhands

* getting rid of my old lasergun

* forgot to delete the old lasergun from yml

* Revert "getting rid of my old lasergun"

This reverts commit 763caefd64f1497da5ff6ac5239e3c64b0a892c2.

* Revert "forgot to delete the old lasergun from yml"

This reverts commit 144f4533c44d29e56e5356389d498a437180fa1e.

* base.png and taser fire cost corrections

* last changes for this PR. the c20 and predator sprites. and corrected meta.json

* lowercased

Co-authored-by: and_a <and_a@DESKTOP-RJENGIR>
 2021-11-25 15:37:21 -07:00
Mith-randalf
4ed0b57ea6 Adds open icon for tonic water (#5502) 2021-11-25 12:35:01 +11:00
mirrorcult
e2205e418b Epinephrine + epipen (#5444) 
* add sprite and basic entity, no reagent or testing

* actually implement epinephrine and add it to the box

* allow creating it

* add it to nanomed

* fig
 2021-11-22 23:51:51 -07:00
Alex Evgrashin
b936ee6ad8 Add barebone nuke (#5242) 
Co-authored-by: Alexander Evgrashin <evgrashin.adl@gmail.com>
 2021-11-11 12:29:11 +11:00
Alex Evgrashin
c1cf22d97e Pinpointer (#5131) 
* Add pinpointer sprites

* Start working on pinpointer

* Updated pinpointer

* Working on visuals

* Working on a pinpointer and eye rotation

* Add client/server pinpointers systems

* Minor cleanup

* Add distance support

* Add nuke tag

* Remove redundant flag and add pinpointer to caps locker

* Disable rotation of pinpointer

* Fixed distance

Co-authored-by: Alexander Evgrashin <evgrashin.adl@gmail.com>
 2021-11-03 14:35:34 -07:00
mirrorcult
3f51ffbd3c Pneumatic cannons (#4560) 
* basics & visuals

* pneumatic cannon works perf

* loc + popups

* gas tank does stuff + queue changes

* updates

* b

* forcefeeding

* inhand

* crafting!

* pie cannon now is a pneumatic cannon

* oopy

* fix for entman + verbs

* pie

* change for tools

* actual

* combat mode + better sounds

* reviews
 2021-11-03 14:33:36 -07:00
ZeroDayDaemon
293186b563 Bartending Content & Bug Fixes (#5038) 2021-10-31 14:57:05 +01:00
Ygg01
14b401f9b3 Puddle refactor 2: Spillastic boogaloo (#4784) 
* Refactor PuddleComponent

* Move puddle effects into separate RSIs

Basically egg/tomato/powder puddle will be moved into separate
/Textures/Fluids RSIs

* Fix YAML for puddles

* Fix issues sloth pointed out.

* Ensure Puddle Component are properly added when spawned

* Remove unnecessary method init puddle with starting maxVolume

* Addressed ElectroSr comments

* Add Resolves

* Try fix error in ensureSolution

* Puddle unanchoring

* Address some issues with puddles

* Fix continue -> return
 2021-10-27 19:24:18 +11:00
mirrorcult
d340bea100 gunpet (#4978) 2021-10-22 11:14:09 +02:00