Commit Graph

1323 Commits

Author SHA1 Message Date
Peptide90
b07fa8562a Fixed APC placement & ID (#3415)
APC was set to alignwallproper not center.
ID was wrong causing crashes
2021-02-25 16:10:54 +01:00
Metal Gear Sloth
d5854a000d Fix lathe animations 2021-02-26 00:30:17 +11:00
Swept
e9af0d58e7 Cleans up lathe rsis (#3392) 2021-02-25 12:48:35 +01:00
PJBot
6acb38754f Automatic changelog update 2021-02-25 06:45:43 -05:00
AJCM-git
31a62dd3b1 Add banana cream pie recipe (#3408)
Co-authored-by: Metal Gear Sloth <metalgearsloth@gmail.com>
2021-02-25 12:45:11 +01:00
Peptide90
fda390cbf7 Cap gun and foam crossbow fixes (#3397)
Assigned sprite for cap gun cartridge. Added cap gun cartridge box. Fixed naming of cap gun speed loader so it shows easier in entity spawner. Fixed cap gun so it deals 0 damage.
2021-02-25 22:30:35 +11:00
PJBot
15ac28572d Automatic changelog update 2021-02-25 05:52:58 -05:00
PJBot
effafac63b Automatic changelog update 2021-02-25 05:46:53 -05:00
Peptide90
be8a45024b New first aid kits (#3396) 2021-02-25 11:46:21 +01:00
Pieter-Jan Briers
eb4f362387 Yo I think we good changelog wise. 2021-02-25 10:49:26 +01:00
PJBot
d1f57f023d Automatic changelog update 2021-02-25 04:42:04 -05:00
PJBot
3388a4afde Automatic changelog update 2021-02-25 04:38:55 -05:00
Pieter-Jan Briers
d2da8afcb5 PyYAML is a shitty library. 2021-02-25 10:37:32 +01:00
PJBot
b084f94a2c Automatic changelog update 2021-02-25 04:24:22 -05:00
PJBot
7013807607 Automatic changelog update 2021-02-25 04:10:40 -05:00
Pieter-Jan Briers
50dfcd4e06 Test changelog to make testing this easier 2021-02-25 10:05:16 +01:00
Pieter-Jan Briers
cca23f2812 Changelog. (#3398) 2021-02-25 09:50:45 +01:00
DrSmugleaf
fdcbece63d Refactor stacks to use prototypes (#3387)
* Refactor stacks to use prototypes

* Fix not assigned warning

* Add names to stacks

* Make machine baords and material constructions use the name as well

* Remove defaulting stacks to prototype id

* Fix tests

Co-authored-by: metalgearsloth <31366439+metalgearsloth@users.noreply.github.com>
2021-02-25 16:18:29 +11:00
Metal Gear Sloth
2079c2e2b6 Fix invalid FoodRecipes and add test 2021-02-25 12:24:09 +11:00
metalgearsloth
adbcfbb951 Mopping enhancements (#3298)
* Bucket starts with water
* Mop has do_after
* Bucket has do_after (user allowed to move while using it as long as they're in range at the end for maximum jannie skill)
* Random cleanup

Co-authored-by: Metal Gear Sloth <metalgearsloth@gmail.com>
2021-02-25 11:32:08 +11:00
Peptide90
48b1336e3c Changes SMG crate to wt550 from c20r (#3399)
C20r is a syndicate weapon. WT550 is sec SMG.
2021-02-25 11:10:14 +11:00
Vera Aguilera Puerto
436d406585 Adds tag support to construction (#3386) 2021-02-24 16:26:56 +01:00
Pieter-Jan Briers
33c9eb06aa Fix clicktest tests. 2021-02-23 22:41:40 +01:00
Pieter-Jan Briers
73fec4c638 Gas tanks: properly localized. 2021-02-23 22:10:07 +01:00
Pieter-Jan Briers
4294499b48 Content localization improvements.
TOSTRING() and PRESSURE() functions.
2021-02-23 22:10:07 +01:00
Pieter-Jan Briers
188c5dbcb5 directional -> norot for bullets.
Since we re-enable noRot for the time being.
2021-02-23 22:10:07 +01:00
Swept
7504c72a22 Organizes Fills (#3385)
* Initial

* Lockers
2021-02-23 20:17:24 +11:00
NuclearWinter
cf7aa5345b Added the ability to drink from Beakers (#3216)
* Added the ability to drink from Beakers

* Allow drinking from beakers, but better

Co-authored-by: metalgearsloth <31366439+metalgearsloth@users.noreply.github.com>
2021-02-23 19:52:43 +11:00
metalgearsloth
55456253f0 Fix the game (#3384)
Cleanup some old PRs and make the world green again

Co-authored-by: Metal Gear Sloth <metalgearsloth@gmail.com>
2021-02-23 19:23:51 +11:00
Swept
1e13c3b265 Fixes lathe stuff (#3383) 2021-02-23 18:53:14 +11:00
Swept
e05698c027 Tags everything that should be tagged (#3372)
* GlassBeaker and FirelockElectronics

* Moves BaseItem

* The rest

* Indentations

* Functional

* for sloth

* Applied zum reviews

Co-authored-by: metalgearsloth <31366439+metalgearsloth@users.noreply.github.com>
2021-02-23 18:48:57 +11:00
Swept
898996abe9 Cleans up NPC and Human YAML and adds tags for Teleportable and FootstepSound (#3371)
* GlassBeaker and FirelockElectronics

* Teleportable + Fixed parented Mobs

* Moved the small tag stuff outta this PR, this is a MOB PR nowgit add .

* FootstepSound

* FootstepSound fixed

* Teleportable

* Added Tags
2021-02-23 18:20:35 +11:00
mirrorcult
c12e590c33 Fix medical scanner layer/mask (#3377)
* fix mediscanner layer/mask

* norot, anchor, pullable
2021-02-23 13:32:10 +11:00
Tarlan2
3ee4c5f791 Auto lathe branch (#3284)
* My first contribution in a while.Change AddAccent command to be case insensitive (#3112)

* got rid of the bottle of nothingness. thought it was an empty bottle.

* new correction

* Delete SpaceStation14.sln

I honestly don't know what happened here. I didn't code those lines.

* Revert "Delete SpaceStation14.sln"

This reverts commit 68876841dce9c6e2ce9d21996e4caef3512b1385.

* new attempt at fixing

* Revert "new attempt at fixing"

This reverts commit 780f66fda3d66b6d4d086871d0b2ea2f6d4ee004.

* Revert "My first contribution in a while.Change AddAccent command to be case insensitive (#3112)"

This reverts commit 08041a30365331b82309aedaf2136d7631459887.

* Revert "Revert "My first contribution in a while.Change AddAccent command to be case insensitive (#3112)""

This reverts commit b2dc76a6683e8df88188d37a836f9ab9a54287b5.

* Revert "Revert "Revert "My first contribution in a while.Change AddAccent command to be case insensitive (#3112)"""

This reverts commit 478d2bfe5daf6098d2f5665249ce0f161704dd73.

* Revert "Revert "Revert "Revert "My first contribution in a while.Change AddAccent command to be case insensitive (#3112)""""

This reverts commit 23c195143e1e3d05cb5f344329c01754432684a9.

* Revert "Revert "Revert "Revert "My first contribution in a while.Change AddAccent command to be case insensitive (#3112)""""

This reverts commit 23c195143e1e3d05cb5f344329c01754432684a9.

* still having figured what happened with the sln file

* please work

* -Added wood as a material.
-Made a few changes in the material requirements for some of the recipes.

* ok. added a small correction for wood at material_stacks.yml

* ok added another correction for misc.yml because for some reason a : just disappeared.

* -added plastic as a material, complete with a png (credits: tgstation)
-replaced glass with plastic for material requirements for some of the latherecipes

* for some reason the shovel was duplicate, being in both botany.yml and in tools.yml. deleted it from tools

* ok. one last try. noticed that the sprite path for shovel was weird even though it already has its own sprite at Objects/Tools/shovel.rsi . so I decided to fix the path then move the shovel back to tools.yml while deleting it from botany.yml. maybe that was the problem?

* corrected the extra space on the type: material for plastic discovered by Peptide90.

* noticed that wood also had a bad icon path.

* another attempt

* weird. I don't remember messing with the flashlight requirements.

* added plastic in the SharedStakedComponent and the meta.json from materials.rsi is back to how it was

* hopefully this icon is valid.

* small corrections concerning double space.

Co-authored-by: DrSmugleaf <DrSmugleaf@users.noreply.github.com>
2021-02-23 13:30:50 +11:00
collinlunn
112f7d8346 Pipe visualizers (#3042)
* modifies pipe sprites to look not connected

* pipe connector sprites

* PipeConnectorVisualizer

* Remove pipe visualizer

* Revert "Remove pipe visualizer"

This reverts commit dc8da93f99f20aa55247c6a94d26c7a75a3d1782.

* PipeDirection can be set with the sprite updating correctly

* fixes meta files

* removes unused vent/scrubber directions

* OnConnectedDirectionsNeedsUpdating

* comments + OnConnectedDirectionsNeedsUpdating gets called

* fix connecteddirections bug

* Combines ConnectedDirections sent to visualizer

* fixes unconnected pipe sprites

* Adds PipeConnectorVisualizer to other piping entities

* code cleanup

* Fixed bug with ConnectedDirections not being set correctly

* diff fix

* rotation simplification

* Improves rsi serialization

* enable nullable

* wip

* visualizer cleanup

* nullable cleanup

Co-authored-by: py01 <pyronetics01@gmail.com>
2021-02-23 13:18:30 +11:00
Pieter-Jan Briers
6a79782fc0 Remove redundant access levels and jobs. (#3360)
We do not need access levels like ResearchDirector when Research | Command works fine.

We also do not need a QM.

Etc...
2021-02-23 13:07:40 +11:00
Clyybber
2de4be1708 Fix map rotation of two things (#3380) 2021-02-22 16:22:31 +01:00
DrSmugleaf
ca055df6a2 Fix outdated Grammar prototype on humans 2021-02-22 14:58:16 +01:00
DrSmugleaf
f7157e9dc3 Fix sec.yml vending machine starting inventory formatting 2021-02-22 14:58:16 +01:00
DrSmugleaf
be1e0abeac Fix BagOpenCloseVisualizer failing with null rsi and redundant sprite component in CigPackBase 2021-02-22 14:39:39 +01:00
Peptide90
1db8f9908d Alphabetised dispenser .yaml files (#3275)
* alphabetised

* alphabetised

* alphabetised

* alphabetised

* alphabetised

* alphabetised

* alphabetised

* Added back SpaceTwinkie

* added thirteenloko back

Removed duplicate grape..silly me
2021-02-22 10:11:59 +01:00
Peptide90
c646404f37 Added remaining vendor inventories (#3305)
* Added remaining inventories

Made remaining vendors usable.
nutri and robotics have some job specific items missing that aren't in yet.

medical will need updated when medical is in.

* added TO DO: for magivend

* added syringe and TO DO:

* added BoneSaw and TO DO

* Update Resources/Prototypes/Catalog/VendingMachines/robotics.yml

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

Co-authored-by: Paul Ritter <ritter.paul1@googlemail.com>
2021-02-22 10:11:00 +01:00
Swept
9c72a7b147 Initial (#3367) 2021-02-22 08:11:09 +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
Remie Richards
85916b87b4 Fluent Localisation Fixes (#3344)
Co-authored-by: Pieter-Jan Briers <pieterjan.briers+git@gmail.com>
2021-02-22 01:07:46 +01:00
Pieter-Jan Briers
63947a6d35 Fixes all the rotation bugs. (#3365) 2021-02-22 00:46:27 +01:00
tmtmtl30
b314c3f040 Adds a very basic perpetual background ambient hum. (#3150) 2021-02-21 14:02:23 +01:00
metalgearsloth
e0eaef1aa9 Data-driven NPC factions (#3249)
* Data-driven NPC factions

* Minor re-factor so it's settable via yaml instead. Any changes made during runtime aren't saved back.
* Still uses enums given bitmasks go BRRT

* private setters whoops

* nullables

Co-authored-by: Metal Gear Sloth <metalgearsloth@gmail.com>
2021-02-21 00:27:17 +01:00
Visne
df8a69d5cd Add all missing descriptions (HELP WANTED) (#3269)
* Add TODOs and some improvements

* Removed ""

* added descriptions

custom not ported.

* vent description

custom not ported.

* scrubber description

custom not ported.

* Update scrubbers.yml

* update description

custom not ported.

* computer frame description

* machine frame descriptions

* Vending machine descriptions

Mostly from TG, some custom.

* description

ported tg

* updated descriptions

Custom descriptions.
Need dynamic APC connector wire description (it's actual range).

* description

ported tg

* description

custom

* Descriptions

Not sure we needed them because it's self explainatory but oh well, now everything is described.
Empty lights have no name or description so have left blank for now.

* descriptions

custom

* descriptions

custom

* Added "" to descriptions

Plus some changes.

* Missed ""

* Updated A to It's a

* Auto stash before merge of "descriptions2" and "Peptide90/descriptions"

* Fix vending machines

* Remove TODOs

* Fix Chocolate vending machine

* Remove all fixed TODOs and small fixes

Co-authored-by: Peptide90 <78795277+Peptide90@users.noreply.github.com>
2021-02-21 00:15:02 +01:00
Acruid
49d040514f Added keybinds to rotate the camera. (#3335)
Added noRot flag to player and ghost sprites so that they stay upright.
2021-02-20 11:06:26 -08:00