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

..

AccessLevels

Adds Chemist Role (#5437)

2021-11-24 23:07:07 -07:00

Actions

Add off icon for disarm, allow off/on icons for Target actions (#5360)

2021-11-15 22:03:34 -07:00

Alerts

Severely nerf fires and severely buff fire protection (#5396)

2021-11-18 23:08:30 -07:00

Atmospherics

Temporarily comments out water vapor gas reaction.

2021-10-14 18:30:07 +02:00

Body

Turn brain behavior into a component/system (#5281)

2021-11-12 23:47:50 -07:00

Catalog

New Guns (hopefully no conflicts this time) (#5105)

2021-11-25 15:37:21 -07:00

Chemistry

Reactive 3.0 (#5443)

2021-11-22 10:17:35 +01:00

Damage

Adds metabolism effects to pretty much every chem already in the game (#5349)

2021-11-20 16:47:53 -07:00

Datasets

Remove probably offensive deathsquad names

2021-11-18 16:33:51 -07:00

Entities

New Guns (hopefully no conflicts this time) (#5105)

2021-11-25 15:37:21 -07:00

EntityLists/Tools

Adds some more toollists and debug entities (#3807)

2021-04-10 07:25:12 +00:00

HairStyles

SKREEEEEE (#3706)

2021-03-28 17:26:32 +11:00

Hydroponics

Massive Food PR (#3436)

2021-05-03 13:17:22 +02:00

Maps

Makes map vote and roundstart smart about player count. (#5418)

2021-11-20 11:32:07 -07:00

NPCs

Data-driven NPC behaviors (#3271)

2021-02-19 22:37:17 -08:00

Objectives

Add character names to round end screen and localize more of the strings (#5088)

2021-11-03 14:40:32 +01:00

Reagents

buzz buzz (#5490)

2021-11-24 23:06:13 -07:00

Recipes

buzz buzz (#5490)

2021-11-24 23:06:13 -07:00

Roles

Adds Chemist Role (#5437)

2021-11-24 23:07:07 -07:00

Shaders

Viewport improvements (#3765)

2021-04-19 09:52:40 +02:00

SoundCollections

Initial (#5193)

2021-11-06 17:32:33 -07:00

Stacks

Fixes some YAML linter errors.

2021-11-12 11:22:46 +01:00

Tiles

Allows placing cables on lattices. (#4984)

2021-10-23 17:32:33 -07:00

ai_factions.yml

Data-driven NPC factions (#3249)

2021-02-21 00:27:17 +01:00

bar_signs.yml

Adds cyber sylph's

2020-08-23 14:48:20 -07:00

holidays.yml

Adds Travis Scott day to list of holidays. (#3236)

2021-02-16 09:41:36 +01:00

hud.yml

HUD Themes (#3774)

2021-04-12 00:43:53 +02:00

melee_weapon_animations.yml

Re-organizing the prototypes folder (#1384)

2020-07-20 12:26:16 +02:00

status_effects.yml

Adds metabolism effects to pretty much every chem already in the game (#5349)

2021-11-20 16:47:53 -07:00

tags.yml

buzz buzz (#5490)

2021-11-24 23:06:13 -07:00

tool_qualities.yml

Add "Slicing" tool quality to knives. (#5473)

2021-11-23 12:24:40 +01:00