Commit Graph

2013 Commits

Author SHA1 Message Date
Boaz1111
5fd3d4552c More pirate weapon content(two new cannon ammo types, a musket and flintlock resprite and rebalance) (#23408)
* tally ho

* yarg

* forgot some shit

* Update projectiles.yml

* fucl

* glass ball

* Update snipers.yml

---------

Co-authored-by: Ed <96445749+TheShuEd@users.noreply.github.com>
2024-01-09 15:23:11 +03:00
Ubaser
fd7c641a76 Resprite powersink (#23281)
* add

* update

* meta
2024-01-09 04:21:08 -07:00
I.K
e7c94c5aaf Make the atmospherics meta not bad (#23737)
juej
2024-01-09 13:18:30 +03:00
IProduceWidgets
f39fbd4800 Add the N1984 pistol (#23775) 2024-01-09 03:17:40 -07:00
Nemanja
fdd18c9ae4 Quantum Spin Inverter (#23756) 2024-01-09 00:37:55 -07:00
Emisse
78442ce4e2 Mining rebalance + seismic charges (#23757)
* push

* PUSH

* reuse cryo explosion

* minus loud

* ore band + pka

* idk dawg
2024-01-09 16:27:00 +11:00
cool dolphin
a34ee7c300 Add delicious mopwata (#23740)
* added delicious mopwata

* added mopwata, the reagent

* fixed issues, changed color, added more possible fills
2024-01-08 19:24:32 -07:00
Tayrtahn
1e3240005f Fix stray pixel in white monkey jumpsuit (#23750)
Blast that smug little pixel
2024-01-08 14:48:33 -07:00
Emisse
6cba5b4278 salvager maxim suit (#23734)
* salvager maxim suit

* why unversioned
2024-01-08 23:55:40 +11:00
Nemanja
c861b66a47 Turbo Recharger (#23723)
turbo charger
2024-01-08 00:15:13 -07:00
Ubaser
2cf4ba8a47 Dehydrated cube box overhaul (#23685)
* add

* yes

* fix
2024-01-07 23:27:40 -07:00
I.K
dc994f9c66 Improve visibility of gun bolts (#23711)
* add overlay

* ??????
2024-01-07 23:23:41 -07:00
Naive817
1b93243bea Adds syndicate cyborgs. Adds Assault cyborgs to nukie uplink (#19733)
* added syndicate cyborgs

* add assault cyborg to uplink

* updated tags.yml

* changed syndicate cyborgs' hitpoints to 200
fixed NPCfaction

* added noslip and MovementAlwaysTouching component to syndicate cyborgs akin to carps, as a stop gap for no magboots or jetpack. Access component fix.

* fixes nodes

* fixes construction

* fixed typo and intergrationtests

* adds back ammocounter for l6c

* fix lawset

* fix item size

* nono, fix again

---------

Co-authored-by: Ed <96445749+TheShuEd@users.noreply.github.com>
2024-01-08 01:12:08 +03:00
TruePaInt
4c2fd55720 Gun cyborg module (#19629)
* Update borg_modules.yml

* Update uplink_catalog.yml

* Update uplink-catalog.ftl

* Add files via upload

* Update meta.json

* Update uplink-catalog.ftl

---------

Co-authored-by: Ed <96445749+TheShuEd@users.noreply.github.com>
2024-01-08 00:03:18 +03:00
lzk
ee21939066 Red racoon suit (#22862)
* comit

* 🚯 🐼

* stupid

* stupid x2

* fix tests

* Update cargo_vending.yml
2024-01-07 23:37:56 +03:00
Nemanja
a78e9a854e Hellfire Thermomachines (#23543)
* hellfire thermomachines

* slight nerf? idk

* ilya review

* Improve clarity

* Update Content.Server/Atmos/Piping/Unary/EntitySystems/GasThermoMachineSystem.cs

Co-authored-by: Kevin Zheng <kevinz5000@gmail.com>

---------

Co-authored-by: Kevin Zheng <kevinz5000@gmail.com>
2024-01-07 08:55:22 -05:00
Aexxie
f724291c2a Adds the central commanders cloak. (#23666)
* Adds the central commanders cloak.

* Adds it to CentDrobe, and also matches it to other naming schemes

* oops fucked up a capital letter. fixed
2024-01-07 00:12:12 -07:00
Ubaser
93a77e89fe Flower wreaths (#23662)
* add

* fix
2024-01-07 00:03:46 -07:00
brainfood1183
bb294a7aa2 Rock Anom effects (#23633)
* Rock Anom effects

* fix

* fix
2024-01-06 23:44:04 -07:00
MaloTV
b85a9d7688 Bullet Type Visual Indicator (#21068)
* Bullet Class indicators

* New Practice Sprite

* Removed re-specified values

* fixes up whitespace to get this merged

---------

Co-authored-by: deathride58 <deathride58@users.noreply.github.com>
2024-01-06 21:36:51 -05:00
Ed
d22fe3f921 SyndiCat (#22554)
* add content

* 4 tk to 8 tk

* replace to autoinject, now cat can explode in any moment. increase cost to 10tk

* Update animals.yml
2024-01-06 17:52:41 -08:00
Ubaser
94d4d22f2d Add trench coats (#23563) 2024-01-06 17:06:15 -08:00
Alekshhh
a3f40c239e Ore Visual Change (#23618)
* Revert "New moth antennae and wing pair, Underwing (#23559)"

This reverts commit 1b4f1ac35d.

* Revert "Revert "New moth antennae and wing pair, Underwing (#23559)""

This reverts commit d2543d566cb398b4d7496e3f189cb638f826bf27.

* ore

* banona

* glo

* shadwe
2024-01-06 14:34:11 -05:00
Ubaser
7858dad9e4 Darken syndicate implanter sprite (#23622)
add
2024-01-06 11:10:56 -05:00
Ubaser
172fcaf2d4 Rename Goldschläger to Gildlager (#23223)
* add

* fix

* catalog

* migration

* conflicts..

* uh

* test

* m

* fix fr

* line?

* beg

* suffering

* um

* fix

---------

Co-authored-by: metalgearsloth <31366439+metalgearsloth@users.noreply.github.com>
2024-01-07 02:34:15 +11:00
Ubaser
17da2f0bee Fix a stray pixel on the large lizard tail (#23619)
add
2024-01-07 00:07:34 +11:00
Nairod
d9eaf9f3c3 Snout Fitting Masks (#23545)
* Snout Fitting Masks

* Line Fix

* Happy Clown
2024-01-06 05:10:04 -06:00
Ilya246
154416787e add syndicate singularity beacon (#18486)
* implement singulo attraction

* add attractor syndie item

* cleanup

* fix name/desc

* actually fix name

* singulo toolbox no longer whitelisted

* add custom sprite, overhaul prototype

* address review

* beacon real

* webedit 1

* webedit 2

* webedit 3

* permalink to copyright

---------

Co-authored-by: deltanedas <39013340+deltanedas@users.noreply.github.com>
2024-01-06 00:21:24 -08:00
Ed
7d30b5ae63 Tesla Gun (#23175)
* add content

* u cant pickup lightning

* -5 heat damage

* Update battery_guns.yml
2024-01-06 18:18:35 +11:00
Ubaser
14e15b4437 Large tail marking (#23551)
* add

* fix copyright

* large
2024-01-06 18:07:09 +11:00
TherapyGoth
c94189d78b Added more pride cloaks and made them craftable at the uniform printer (#21077)
* added more pride capes

* made the capes craftable

* fixed sprite names and coding errors

* renamed capes to cloaks to be in line with other cloaks

---------

Co-authored-by: metalgearsloth <comedian_vs_clown@hotmail.com>
2024-01-06 17:15:06 +11:00
Aexxie
05866a267f Lizzer axolotl frills no longer look bad (it had messed up offset) (#23595)
FIXES THE 2 PIXEL OFFSET AHHHHHHHHH
2024-01-06 16:43:34 +11:00
Alekshhh
35fe14430c Ghost Sheet Inhand Fix (#23560)
boo
2024-01-05 18:28:07 -05:00
GreyMario
8577507c20 make chem layer in bottles not semitransparent (#23581) 2024-01-05 17:01:04 -05:00
Ubaser
1b4f1ac35d New moth antennae and wing pair, Underwing (#23559)
* add

* delete old image
2024-01-05 08:55:49 -05:00
Alekshhh
ccd9ae2fd8 Uranium Ore Visual Change (#23526)
hamlet after you won't let them eat a stack of uranium ore
2024-01-04 22:35:52 -05:00
Flareguy
29e48d3e27 Ports the derelict sign decal (#23544)
ports the derelict sign decal
2024-01-04 22:35:31 -05:00
Ed
0f8c004a2f Teslaloose and Singuloose counterplay (#23444)
* add tesla dissapear mechanic
add field holobarrier

* add PD

* add crafting

* spacing

* added to cargo

* Fix

* resprite + damageable

* oopsie

* Update Resources/Prototypes/Entities/Objects/Weapons/Guns/Battery/battery_guns.yml

Co-authored-by: Kara <lunarautomaton6@gmail.com>

* Update Resources/Prototypes/Entities/Objects/Weapons/Guns/Battery/battery_guns.yml

Co-authored-by: Kara <lunarautomaton6@gmail.com>

* Update Resources/Locale/en-US/research/technologies.ftl

Co-authored-by: Kara <lunarautomaton6@gmail.com>

---------

Co-authored-by: Kara <lunarautomaton6@gmail.com>
2024-01-04 18:48:09 -08:00
Mr. 27
7947b4e599 Arachnid plushie (#23504) 2024-01-04 15:58:40 -08:00
PrPleGoo
eed663e8b4 Add health bar overlays for eye equipment (#21980)
* PR 1

* fix an error with health bar overlay (#1292)

* Revert "Revert "Replace `ResourcePath` with `ResPath` (#15308)" (#155… (#15566)

* [1612] change ShowHealthBarsComponent's DamageContainer field to a list (#1662)

* fix build

* no crit entities from not updating

* cleanup

* namespace

* undu irrelevant changes

* undo icon change

* make health bar 1 px taller and icon 1 px shorter

* fix medibot

* fix comment

* don't show health bar ratio when in crit

* fix build

* put the crit bar back

* don't render healthbars for mobs that are in containers

* draw more boxes without the background sprite

* fine status icon for all bio mobs

* add wacky mandatory things

* attempt 2

* whoops wrong file

* cool, this works too

* move null check to top

* only 1 init

* security huds

* remove shader

* fix build after cleanup

* slight cleanup

* little more cleanup

* Remove clothing grant component system

* security HUD now shows a job icon on entities with a body

* remove sec stuff and do similar changes to split off PR + remove unused comp

* process comments

* don't return

* update to ComponentAddedOverlaySystemBase

* no cache

* colors and not rendering out of sight

* touch ups

* fix build & cleanup

* undo

* remove shader from icons

* process comments

* documentation

* fix licence

* validate prototype id

* just use args

* rename method and append in method

* type

* just fucken delete the command

* space

* undo

* remove

* don't use LocalPlayer

* re-add showhealthbars command, but working

* rename icon lists and conform health icon code to the others

* space

* undo

* update command

* oops

---------

Co-authored-by: Rane <60792108+Elijahrane@users.noreply.github.com>
Co-authored-by: metalgearsloth <31366439+metalgearsloth@users.noreply.github.com>
2024-01-04 11:48:57 -05:00
Alekshhh
dfc8ca489c Plague Doctor Set Change (#23382)
pesilen
2024-01-04 06:09:11 -07:00
VMSolidus
84a2356831 Adding PAI Slot to PDA (#21086)
* Adding PAI Slot to PDA

* Update PdaComponent.cs

* Update pda.yml

* Update tags.yml

Sorting it alphabetically

* Adding PDA UI Elements.

* Addressing reviews

* Update PdaComponent.cs

* Update Content.Shared/PDA/SharedPdaSystem.cs

Co-authored-by: faint <46868845+ficcialfaint@users.noreply.github.com>

* Update Content.Shared/PDA/SharedPdaSystem.cs

Co-authored-by: faint <46868845+ficcialfaint@users.noreply.github.com>

* Update Resources/Prototypes/Entities/Objects/Devices/pda.yml

Co-authored-by: faint <46868845+ficcialfaint@users.noreply.github.com>

* Update PdaComponent.cs

* Update PdaComponent.cs

---------

Co-authored-by: faint <46868845+ficcialfaint@users.noreply.github.com>
2024-01-04 05:56:14 -07:00
brainfood1183
b06d9cb64a Adds Hellspawn (Nar'Sie demon mob) (#20291)
* HellSpawn Mob

* added spawner

* summary for the namespace

* larger collider, cannot enter single tile corridors.

* fix

* remove duplicate from yml, fix attributions.

* moved action to shared, moved comp to shared, networked comp, separated heal, fixed attributions

* removed flammable from hellspawn
removed the healing effect from firestarter ability (healing can be separate ability).

* Update attributions.yml

fix attributions

* fix

* fix
2024-01-04 05:53:15 -07:00
ERROR404
abbb724849 Observation Kit (#23384)
Observation Kit
2024-01-04 05:36:44 -07:00
Ed
1c5639be75 Human plushie (#23518)
* AAAAAAAAA

* TBoI reference

* really remove from cargo crate. redescription

* pipi
2024-01-04 05:27:40 -07:00
KittenColony
df07e194fb Spinal spike marking for Reptilians (#23220)
* backspikes added

* added backspikes to meta.json

* fixed capitalization

* fix attempt 2

* suffering

* Revert "suffering"

This reverts commit d9ee23ccd209e8de5b190668f3b795088e8ab139.

* Balance is restored

* Revert "Balance is restored"

This reverts commit fa9b8168d461f8d5e92f2bbd1e1dd1417972ea05.

* Revert "Revert "Balance is restored""

This reverts commit f0a809f258973e0605311250d969e0600a970ebc.
2024-01-04 02:49:51 -07:00
themias
0fd68b2af8 Add clown emergency oxygen tank (#23495)
* Add clown emergency oxygen tank

* increase pressure and volume slightly due to less o2 percentage
2024-01-04 14:29:02 +11:00
Alekshhh
ee410fa2cd Green-Red Jester Outfit Change (#23454)
jokaire
2024-01-03 17:40:22 -07:00
deathride58
4d0d2e4c5a Kobold variety - allows kobolds to have random colors and horns (+ allows RandomSpriteComponent to uh. Actually choose random sprites for specific layers) (#23393)
* kobold variety - allows kobolds to have random colors and horns

* hey lets maybe not crash in this case, lets maybe let the color continue being null in this case

* excuse us vscode what the fuck is this

* brightens kob base, makes kob outline more bold, fixes to the prototype because our code spaghett

* okay yeah angler horns just dont work At All. the floppy kobold ears, however? MWAH. chef's kis

* we've been staring at these critters all day - makes base color line up with the base color of some of the markings
2024-01-03 17:39:00 -07:00
deathride58
6901e930b5 Blindness hotfix (content side) (#23465)
* fixes major blindness issues like blindness not scaling with render res

* HEY. get outta there
2024-01-04 11:17:06 +11:00