juni/crystall-punk-14
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
17,294 Commits 57 Branches 0 Tags
7cdfaa09d5f690f1e56d00a831becf27c485457f
Commit Graph

4867 Commits

Author SHA1 Message Date
Nemanja
7cdfaa09d5 Procgen asteroids for salvage magnet (#17547) 
* Procgen asteroids for salvage magnet

* big roids, remove min offset radius

* i fuck with configs a bit more

* some shit i guess

* actually this makes more sense
 2023-06-25 12:50:41 -05:00
Nemanja
5c60a27c7c Make item size scale with stack size (#17623) 
* Make stack count affect item size

* and the test, too

* readd this check

* vwoom

* huh

* if you ever read this commit message ping me on discord in #contributors

* changerinos
 2023-06-25 10:44:37 -05:00
deltanedas
809255ffb1 give regular crowbar same damage as emergency (#17284) 
* swap emergency and regular crowbar damage

* a

* same damage

* remove dupe

* egg

---------

Co-authored-by: deltanedas <@deltanedas:kde.org>
 2023-06-24 14:05:02 -06:00
Alekshhh
c9f6f630ec drugs (#17588) 2023-06-24 14:01:03 -06:00
Sailor
8ce0370544 Commit trolling (#17607) 2023-06-24 13:57:56 -06:00
Alekshhh
2b7cc01e7f Capgun Ammo Recolor (#17617) 
* he's got a gun

* gung

* oops
 2023-06-24 13:56:42 -06:00
0x6273
fcb6516cee Hotplate overhaul (#17586) 
* Hotplate overhaul

- Beakers are now placed on top of the hotplate instead of itemslot.
- Hotplate LED now only lights up if it's heating something.
- More comments/xmldoc.
- Some other minor tweaks.

* Actually remove the beaker slot
 2023-06-24 14:09:24 -04:00
LankLTE
de07c2b599 Adds Health Analyzer to Chem PDA (#17603) 2023-06-24 22:11:47 +10:00
Nim
46e96239d3 Seeds of fly agarics Amanita EMAG (#17598) 2023-06-24 22:03:08 +10:00
Nemanja
489077868c Artifexium (#17604) 2023-06-24 22:00:42 +10:00
lzk
5d126d7774 Remove some dupe prototype components (#17551) 2023-06-24 21:59:20 +10:00
crazybrain23
032399c599 Change QM's supervisor to Captain (#17605) 
* QM works for Cap

* Cargo department works for QM
 2023-06-24 00:32:15 -05:00
CrigCrag
9792116c50 janitorial trolley speed buff (#17524) 
* Update janitor.yml

* Update Resources/Prototypes/Entities/Objects/Specific/Janitorial/janitor.yml

Co-authored-by: Chief-Engineer <119664036+Chief-Engineer@users.noreply.github.com>

* Update janitor.yml

friction gaming

* tweak cart friction

* Update Resources/Prototypes/Entities/Objects/Specific/Janitorial/janitor.yml

* comment

---------

Co-authored-by: Chief-Engineer <119664036+Chief-Engineer@users.noreply.github.com>
 2023-06-23 12:49:19 -05:00
lzk
5e83956d15 Fix jumpskirt parents (#17552) 2023-06-23 22:24:38 +10:00
FluidRock
17254eca15 Replace flare ammo with incendiary ammo in Zombie bundle (#17558) 2023-06-23 22:24:03 +10:00
Justin Trotter
ecf92066ab make mining drills weldable and have struct damage (#17576) 2023-06-23 22:23:20 +10:00
Nemanja
476f7800c8 22 New Cargo Bounties (#17582) 2023-06-23 14:31:53 +10:00
Nemanja
7ab5127286 Cargo Bounties (#17344) 
Co-authored-by: metalgearsloth <31366439+metalgearsloth@users.noreply.github.com>
 2023-06-22 21:49:33 +10:00
Nim
4ed11ca73b Energy Shield (#16996) 
* energy shield

* description edits

* shields protect

* small correction

* say no to asteroid bees

* fix

* BlockModifier

* fix

* tweak

* tweak

* ops

* fix

* Update RobustToolbox

* Revert "Update RobustToolbox"

This reverts commit 55be82fe537490367e0afaf86365b0e274e6597e.

* formatting
 2023-06-22 00:08:58 -04:00
Nemanja
966345a4e3 Add missing border colors on PDAs (#17541) 2023-06-21 15:45:17 -06:00
liltenhead
a20fa2a233 modify medkit fill (#17527) 2023-06-21 15:35:20 -05:00
lzk
53bd13ffd5 animals.yml pets.yml cleaning (#17533) 
* Update pets.yml

* Update animals.yml

* oopsie
 2023-06-21 13:54:20 -06:00
lzk
3f946bb1e5 secure windoor id standartization (#17531) 
* Update windoor.yml

* comit
 2023-06-21 12:44:17 -06:00
lzk
cd949bcb2b some more netsync: false removing (#17472) 
Co-authored-by: metalgearsloth <comedian_vs_clown@hotmail.com>
 2023-06-22 01:00:53 +10:00
Chief-Engineer
f14f09cc90 remove armor from uniforms (#17523) 2023-06-22 00:30:31 +10:00
Alekshhh
c1a971f3a6 dorf (#17475) 2023-06-20 14:30:56 -06:00
Sailor
4c43e20af3 Vend contraband/emag inventory expansion (#17503) 
* Vend contraband/emag inventory expansion, do a 2-year TODO

* Map checks failed real
 2023-06-20 14:30:27 -06:00
CrigCrag
b795479245 buff atmos firesuits, nerf atmos hardsuits (#17507) 
* buff firesuits in suits.yml

* Update hardsuits.yml to nerf atmos hardsuit heat resistance
 2023-06-20 14:29:13 -06:00
MisterMecky
ec71f1bc8e update stimpack desc (#17496) 2023-06-20 05:45:42 -05:00
Nemanja
a01f26d3a6 fix lathe syncing and tweak ui (#17489) 2023-06-20 00:39:35 -06:00
deltanedas
763f6048f2 make taser require silver (#17477) 
Co-authored-by: deltanedas <@deltanedas:kde.org>
 2023-06-20 00:39:20 -06:00
Vordenburg
34e03a07f2 Improve HandLabeler and AgentID UI (#16902) 2023-06-20 00:52:03 -04:00
metalgearsloth
55690f688e Remove cat ear guaranteed spawns (#17488) 2023-06-20 13:53:26 +10:00
metalgearsloth
d4c87155f8 Nerf stims (#17485) 2023-06-19 19:23:10 -07:00
Jackal298
3cb919fe77 Small addition to mercenary items (#17464) 
* Small addition to mercenary items

try number three

* Bot

* Bot fix
 2023-06-19 11:38:57 -06:00
lzk
3d98319069 Add more windoors (#17471) 2023-06-19 11:29:44 -06:00
lzk
bf8fa41ecd comit (#17462) 2023-06-19 02:36:29 -06:00
Nemanja
ea767b742b Buff ores, add quartz (#17453) 2023-06-18 22:03:41 -06:00
lzk
acf102ba0d add suffix for rigged gloves (#17287) 
* Update gloves.yml

* Update Resources/Prototypes/Entities/Clothing/Hands/gloves.yml

Co-authored-by: keronshb <54602815+keronshb@users.noreply.github.com>

---------

Co-authored-by: keronshb <54602815+keronshb@users.noreply.github.com>
 2023-06-18 19:14:28 -06:00
deltanedas
21b583a68c add pkas back to salv vendor (#17446) 
* add pka back to salv lockers

* troller ops

---------

Co-authored-by: deltanedas <@deltanedas:kde.org>
 2023-06-18 18:53:01 -06:00
Flareguy
0e238dabc9 Adds the SWAT Helmet (#17384) 
* adds swat helmet

* joever

* epic > rare

* A
 2023-06-18 17:38:55 -06:00
Nemanja
580c57926f Remove security techfab board from expedition loot (#17448) 2023-06-18 17:37:34 -06:00
Nemanja
b8fb9aaabd Make BOH require less uranium (#17449) 2023-06-18 17:37:16 -06:00
Nim
9797a0d42e ert and death squad gas mask (#17444) 2023-06-18 17:14:31 -06:00
Pieter-Jan Briers
c8930106b6 CE belt in locker again, CE doesn't spawn with it. (#17445) 
Better way to do #17430

Yes I know this means the CE spawns with a regular filled toolbelt they'll just throw away at round start. Oh well.
 2023-06-18 17:13:53 -06:00
Vordenburg
7ea7e3f49d Set marker drawdepth to Overdoors (#17438) 2023-06-18 16:38:27 -06:00
Nemanja
8411739e00 Fix secfab being able to print protolathe items (#17443) 2023-06-18 16:35:19 -06:00
Nemanja
3975578e4e Arsenal tech discipline (#17400) 2023-06-18 15:56:49 -06:00
Chase Maguire
8cd6067d49 Changing default fuel consumption for weldable components, and increasing non-default instances by two units of fuel (#17350) 2023-06-18 15:56:09 -06:00
Chief-Engineer
7c432b09e1 update command role requirements (#17366) 
* update role requirements

* add 6 hr overall requirement for mime

I keep seeing mimes that don't know the controls, specifically how to use other chat channels, like emoting.

* fix wrong prototype

* split to part 2

* fix engi belts

this is a pain
 2023-06-18 15:53:05 -06:00