tommy/tbd-station-14
2
1
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
32,187 Commits 3 Branches 5 Tags
7567f17a461e2535c39170e9861dbc96ff8cb15e
Commit Graph

1174 Commits

Author SHA1 Message Date
Cheackraze
ec00589791 Practice Disabler (#12301) 
* pewpew

* renamed the rsi and reparented off WeaponDisabler
 2022-11-08 14:21:13 -06:00
Julian Giebel
e11cf969fa PDA UI refactor and cartridges (#11335) 
* Work on cartridges

* Work on PDA UI

* Work on PDA UIs program list

* Work on PDA UI borders

* Add DeviceNetworkingComponent to the pda base prototype

* Fix submodule version

* Fix cartridge loader ui key

* Fix pda menu xaml

* Implement relaying ui messages

* Finish implementing the notekeeper cartridge

* Fix submodule version

* Fix errors from merging master

* Fix test failing

* Implement setting preinstalled programs

* Add some documentation to CartridgeLoaderSystem

* Add more doc comments

* Add localization to program names

* Implement review suggestions

* Fix background programs receiving events twice when active
 2022-11-08 14:00:20 -06:00
ZeroDayDaemon
325ccc1c17 Add DamagePopup, Target Entities, And Practice Laser Gun (#12317) 2022-11-06 02:32:00 +11:00
rolfero
2ef33e11b6 Fixing some prototypes modifying components on init (#12385) 2022-11-06 02:28:44 +11:00
Vordenburg
b4fbc63132 Add necessary sprites for welder_mini. (#12368) 2022-11-03 16:22:56 -05:00
Vordenburg
784e0ab51f Make welder flames like proper unshaded lights. (#12320) 
* Make welders use ToggleableLightVisualsComponent.

* Remove old code from ToolSystem.Welder.

* Update welder sprites.
 2022-11-01 20:16:33 -05:00
brainfood1183
062d3c656e New Tiles (2 maintenance specific and 1 new wood). (#12193) 
* new maint specific tiles

* merge

* merge

* merge

* merge

* Update Resources/Textures/Tiles/attributions.yml

Co-authored-by: Moony <moony@hellomouse.net>
 2022-10-25 13:27:06 -05:00
Cheackraze
a512a77046 Zookeeper (#12020) 
* jumpsuit sprite

* hat and meta to match

* pda

* id card

* update spawner jobs.yml

* update identification_cards.yml

* Update pda.yml

* update jumpsuits.yml

* zookeeper job yml

* zookeeper icon

* update hats.yml

* woops fixed hats.yml

* fix id cards yml

* job spawner icon and json

* update map yml

* update departments yml

* job icon meta.json

* comes with the hat

* real

* real

* localization

* fix spawner jobs yml

* playtime tracker

* kettle spawn

* Revert "kettle spawn"

This reverts commit 37c241cb31a6f186f31a73f168a93649423e839a.

* kettle spawn

* service locked windoor

* updated sprites and updated meta.json thanks to EmoGarbage

* meta.json

* Update Resources/Textures/Objects/Devices/pda.rsi/meta.json

Co-authored-by: Nemanja <98561806+EmoGarbage404@users.noreply.github.com>

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

Co-authored-by: Nemanja <98561806+EmoGarbage404@users.noreply.github.com>

* credit to EmoGarbage404 and alphabetized

* license

Co-authored-by: Nemanja <98561806+EmoGarbage404@users.noreply.github.com>
 2022-10-23 14:42:25 -05:00
Willhelm53
a6be9e75dc Blue Shark Soft Toy! (#12047) 2022-10-22 14:58:18 -07:00
Nairod
8da57fb16a Handgun belt sprites (#12081) 2022-10-22 14:53:43 -07:00
Nairod
50d8ed6c89 Spare headsets for the HoP (#11954) 
* textures and fill yml

* texture meta edit

* box id fix, locker fill, vendor fill

* whitelist fix
 2022-10-16 13:21:02 -05:00
themias
b567c34e92 Add voice trigger for modular grenades (#11449) 2022-10-17 04:44:50 +11:00
Nemanja
9363674bd5 Bad 2 Da Bone [Skeleton Tweaks] (#11669) 
Co-authored-by: Kara <lunarautomaton6@gmail.com>
 2022-10-15 15:06:01 -07:00
TaralGit
0d3a22cffa New sprites for pirate and deckard revolvers (#11481) 
Co-authored-by: and_a <and_a@DESKTOP-RJENGIR>
 2022-10-03 18:57:10 -07:00
Nemanja
b8ba867456 advanced parts recipes (#11541) 2022-09-26 21:45:36 -05:00
Nemanja
635142aa1c ian fortnite burger (#11435) 2022-09-20 19:16:59 -07:00
lapatison
d5f562648b Opened soda can texture fix (#11420) 2022-09-19 16:47:45 -07:00
Illiux
3722106cd4 Add 2 bottle boxes to chemistry lockers (#11298) 2022-09-15 08:17:32 -05:00
themias
d36a58dd2e Add visualizer to hot coffee and tea (#11211) 2022-09-11 20:53:48 -07:00
TaralGit
47dd0ff2e8 Advanced laser gun and four resprites (#11102) 
Co-authored-by: and_a <and_a@DESKTOP-RJENGIR>
 2022-09-10 23:46:38 -07:00
Nemanja
7199defdff among pequeno (#11115) 
* among pequeno

* better colors + fucked up sprites oops

* Update meta.json

* copy*right* and price 3
 2022-09-10 19:08:16 -05:00
lapatison
99357f7ef4 CBURN tweaks (#10887) 2022-09-05 19:49:56 -07:00
metalgearsloth
0286b88388 NPC refactor (#10122) 
Co-authored-by: metalgearsloth <metalgearsloth@gmail.com>
 2022-09-06 00:28:23 +10:00
Peptide90
5a5884727f Guns as clothing PR (suit storage, back, belt) (#9330) 
Co-authored-by: metalgearsloth <31366439+metalgearsloth@users.noreply.github.com>
 2022-08-31 20:21:13 -07:00
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
OctoRocket
001830b6e4 Fixed energy dagger sprite being flipped the wrong way in one frame of its animation (#10560) 2022-08-13 22:15:54 -07:00
Nemanja
1470957e7e Night At The Orchestra [All the Instruments] (#9364) 2022-08-08 12:21:54 +10:00
Kara
b947151d9a Bucket solution fills + ECS SolutionContainerVisualizer (#10289) 2022-08-07 01:50:52 -07:00
CormosLemming
e227f208bc Changes popcorn sprite to have the number fourteen instead of thirteen. (#10134) 2022-07-30 19:56:04 -07:00
Rane
e36b155325 Port boxer from Nyano (#9080) 2022-07-26 18:34:19 -07:00
TaralGit
c4dd5b676c guns (#9958) 
Co-authored-by: and_a <and_a@DESKTOP-RJENGIR>
 2022-07-24 21:25:41 +10:00
lapatison
f94e3743b2 Centered shot glass sprite (#9986) 2022-07-23 18:47:02 -07:00
Rane
abab5bedcd Port honkbots from nyano (#9698) 2022-07-15 00:54:34 -07:00
Kara
e43915c94a Proto-kinetic accelerator (#9748) 2022-07-15 14:28:14 +10:00
Kara
ad7889e8a9 Magic staves + wands (#9070) 2022-07-14 19:45:27 -07:00
TaralGit
ccefd0caf0 RPG-7, Kardashev rifle and Hristov heavy sniper resprites (#9729) 
Co-authored-by: and_a <and_a@DESKTOP-RJENGIR>
 2022-07-14 08:37:57 -07:00
Moony
ef6d0344de Revert "Fireaxe resprite" (#9676) 2022-07-13 10:22:31 +02:00
KIBORG04
71c8d08e4c Kvass (#9082) 
* add kvass

* nevermind

* forgot about double 's'

* Update tanks.yml

* gotovo

* Update meta.json
 2022-07-11 23:11:12 -07:00
Emisse
fb6586cdc6 Lamp Plushie (#9118) 
* Update meta.json

* Add files via upload

* Update toys.yml

* Update toy.yml

* Update toys.yml
 2022-07-10 20:13:16 -05:00
metalgearsloth
5107bc3be7 Bullet impact effects (#9530) 2022-07-09 13:46:11 +10:00
Deahaka
a7e4152171 Fireaxe resprite (#9302) 
* fieraxe

* traitor-fireaxe
 2022-07-08 20:03:20 -07:00
Nemanja
e36a4e44f5 sprite fix (#9542) 2022-07-09 04:09:27 +10: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
TaralGit
f6da17d7d9 highlights (#9332) 
Co-authored-by: and_a <and_a@DESKTOP-RJENGIR>
 2022-07-06 19:57:23 +10:00
metalgearsloth
40eecdd78a Stamina damage (#9230) 2022-07-06 18:06:12 +10:00
ninruB
3c4998649b Make the extra bright lantern actually flash you. (#9387) 
* lantern goes STUN STUN

* fix an awkward extra spacebar

* fixing the lantern as emogarbage suggested

* buffs the usage amount

ngl, 15 might be a bit over the top, but it is several times larger than a normal flash so it somewhat makes sense.

* fixed encoding
 2022-07-05 11:40:19 -07:00
Aerocrux
064e34e9c5 Fix invisible held sprites for capgun (#9390) 
* Fix capgun YAML for held sprites and touch up in-hand sprites

* Remove capgun size to inherit BaseItem size 5
 2022-07-05 10:09:54 -07:00