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

3979 Commits

Author SHA1 Message Date
DerbyX
8345778eec Glasses/Hud Art Dump with Minor Changes To Beer Goggles (#18130) 
* Glasses/Hud Art Dump

* Forgot to change omni ID

* Changed id in other ymls to match new one

* Redo

* Updated Map Beer Goggles IDs

---------

Co-authored-by: Derby <Derby@ss14>
 2023-07-24 14:32:33 -06:00
PixelTK
2298ae92c3 Small (and maybe unnoticable) arachnid changes (#18261) 
* Small arachnid sprite changes

* chest marking colour
 2023-07-24 14:21:07 -06:00
deltanedas
b0f815cdc6 give station records its own board (#18183) 
Co-authored-by: deltanedas <@deltanedas:kde.org>
 2023-07-23 21:14:43 -06:00
Tunguso4ka
730285290a coffin and two graves (#18213) 2023-07-23 21:13:10 -06:00
DerbyX
6a9dfac3a2 New Figurines (#18198) 
* New Types Of Figurines

* Rerun

* Forgot to add Paramedic to toy.yml

* Forgot to add credit in meta

---------

Co-authored-by: Derby <Derby@ss14>
 2023-07-23 21:06:07 -06:00
Errant
5836959388 Gas tank cleanup and fix (#18214) 
* gas tank size tweaks

* gas_tanks cleanup

* gas_tanks cleanup

* gas_tanks cleanup

* gas tank supply time comment

* gas tank cleanup

* gas tank cleanup comments

* gas tank cleanup

* gas tank cleanup
 2023-07-23 13:17:31 -06:00
Skarletto
cc411ecf57 add cap cap (#18234) 
* add cap cap

* locker'd
 2023-07-23 13:15:52 -06:00
vanx
cfb827c99b ammo counters (#18165) 2023-07-23 02:03:04 -04:00
Emisse
ef3a6b245b Nerf bed and medical bed healing potency for groups (#18222) 2023-07-23 13:18:06 +10:00
brainfood1183
ebab4cae8c Straitjacket Functionality. (#18052) 2023-07-22 18:14:25 -04:00
JimGamemaster
3eff0b7fbd Change to allow Space creature types to float in space like carps do (#18190) 2023-07-21 14:10:21 -06:00
SpaceCat
1dfff30612 changes the id of the forensic gloves to be more structured and standards compliant (#18178) 
* Replaces forensic gloves id with a more structured one

* Fixes

* add changes to migration.yml

* add changes to migration.yml

* last fixes(please)
 2023-07-21 13:03:36 -06:00
PixelTK
9cc8d6902e Arachnids: New markings, new organs sprites and chelicerae (#18177) 
* New markings, new organs sprites and chelicerae

* Update locale
 2023-07-20 15:55:49 -06:00
Arendian
657d15751b Disposable turret balance changes (#18155) 
* tweaked stats

* change comment
 2023-07-19 20:16:09 -06:00
Ilya246
be588242b4 add syndicate monkey reinforcement (#18126) 
* implement

* 8tc

* reparent syndicate monkey, remove clumsy
 2023-07-19 15:23:23 -06:00
Arendian
580d481710 Make clumsy entities able to shoot funny weapons (#18156) 
* Make clumsy entities able to shoot funny weapons

* remove unneeded line
 2023-07-19 15:22:07 -06:00
Slava0135
2eb6689834 clown mimimi sleeping sound (#18127) 
* clown mimimi sleeping sound

* make its own component

* different sound (with attribution)

* oopsie

* back to mimimi (with attribution)
 2023-07-19 02:55:50 -06:00
TemporalOroboros
6313164368 Fixes singularity collision and consume range (#13424) 
Co-authored-by: keronshb <keronshb@live.com>
 2023-07-19 18:01:27 +10:00
vanx
0e42ecba70 Uplink extention: nukie edition (#18011) 
* added and rebalanced some uplink stuff

Signed-off-by: vanx <vanx#5477>

* typo

Signed-off-by: vanx <vanx#5477>

* added combat medipen to the meds bundle

Signed-off-by: vanx <vanx#5477>

* raised healing prices a bit

Signed-off-by: vanx <vanx#5477>

* mosin ammo box finally
Signed-off-by: vanx <vanx#5477>

* implants price swap + buff

Signed-off-by: vanx <vanx#5477>

* more meds for less yay

Signed-off-by: vanx <vanx#5477>

* free samples
Signed-off-by: vanx <#vanxxxx>

* microbombs for everyone

Signed-off-by: vanx <#vanxxxx>

* grenadier rig cheapening

Signed-off-by: vanx <#vanxxxx>

* merge conflict

Signed-off-by: vanx <#vanxxxx>

* More meds fuck it

* locale
Signed-off-by: vanx <#vanxxxx>

---------

Signed-off-by: vanx <vanx#5477>
Signed-off-by: vanx <#vanxxxx>
Co-authored-by: vanx <vanx#5477>
Co-authored-by: vanx <#vanxxxx>
 2023-07-19 00:05:53 -06:00
Abbey Armbruster
6442db5a1e Fire place ambience (#18134) 
* add fireplace ambience (#1692)

* changes for upstream

---------

Co-authored-by: Rane <60792108+Elijahrane@users.noreply.github.com>
 2023-07-18 19:19:31 -06:00
Emisse
e393eedd09 captains sword reflect chance (#18133) 2023-07-18 16:55:29 -06:00
Flareguy
ae9af73263 Adds the Improvised Shotgun (#18025) 
* improvised shotguns

* spaghetti

* progress so far (TODO: rename modular_reciever.yml)

* i forgotted

* everything so far

* fuck fuck fuck (boner boner)

* ganon: You must die

* bobie

* boob boob booby balls
 2023-07-18 15:10:07 -06:00
Puro
10b1843767 [Dresser] Filling with garbage (#18029) 
* [Dresser] Filling with garbage

* shs

* now its really ready 

yes.

* ops miss click

* OrGroup update!

Now rly dresser with trash

* .

* ,
 2023-07-18 15:02:02 -06:00
Vordenburg
2715685f13 Use new TG stamp icons (#18123) 
To match TG DMI, rename states:
* -iaa to -ok
* -cent to -centcom
 2023-07-18 14:56:34 -06:00
Visne
ee4809a222 Revert "Hunger and thirst HUDs" (#18125) 2023-07-18 17:28:28 +02:00
PrPleGoo
67e4b626c1 Hunger and thirst HUDs (#18066) 
* security HUD now shows a job icon on entities with a body

* thirst goggles

* set starting hud gear
 2023-07-18 00:01:22 -06:00
vanx
9268789618 nukie reinforcements (#18034) 
Signed-off-by: vanx <#vanxxxx>

Co-authored-by: vanx <#vanxxxx>
 2023-07-18 00:00:24 -06:00
lzk
b82224379a give description for t-ray (#18080) 
* Update t-ray.yml

* Update Resources/Prototypes/Entities/Objects/Tools/t-ray.yml

Co-authored-by: metalgearsloth <31366439+metalgearsloth@users.noreply.github.com>

* Update Resources/Prototypes/Entities/Objects/Tools/t-ray.yml

Co-authored-by: crazybrain23 <44417085+crazybrain23@users.noreply.github.com>

---------

Co-authored-by: metalgearsloth <31366439+metalgearsloth@users.noreply.github.com>
Co-authored-by: Emisse <99158783+Emisse@users.noreply.github.com>
Co-authored-by: crazybrain23 <44417085+crazybrain23@users.noreply.github.com>
 2023-07-17 23:59:26 -06:00
crazybrain23
61fd8b63e9 fix warden coat (#18114) 2023-07-17 16:52:46 -06:00
Arendian
a39b3eddbd New implanters for uplink (#18038) 
* New implants for uplink

* made changes based on reviews

* was meant to be 3
 2023-07-17 13:48:09 -06:00
deltanedas
3bdfcbe56d nuke minor refactor and fixes (#18100) 
* minor nuke refactor, no longer require disk to toggle anchor

* file scope

* fix unanchored prototype

* normal nuke reanchor pro

* somehow fixed everything pro

* !

---------

Co-authored-by: deltanedas <@deltanedas:kde.org>
 2023-07-17 13:37:33 -06:00
Flareguy
99bad20c48 buffs edagger, moves price of edagger and jetpack to 2tc (#18103) 2023-07-17 13:37:10 -06:00
Slava0135
337870f60d Add holy hand grenade (#18107) 
* no sound yet

* point light

* hallelujah

* uplink

* fix license maybe?

* 3.0 then (fake)
 2023-07-17 13:36:37 -06:00
Slava0135
7f76dd11b3 more visible explosive banana peel (#18105) 
* more visible explosive banana peel

* i am idiot
 2023-07-17 13:35:58 -06:00
crazybrain23
1f55391b42 CentCom PDAs and other ID card changes (#18109) 
* centcom pda and other ID changes

* remove duplicate pda
 2023-07-17 13:31:34 -06:00
/ʊniɹɑː/
307c436c4c readd structure tag to bookshelf (#18111) 2023-07-17 13:31:11 -06:00
Nemanja
1e2fa8465a reduce artifact container weight (#18112) 2023-07-17 13:30:52 -06:00
Arendian
0dfa31ce0b fix diona hunger decay rate (#18108) 2023-07-17 13:18:11 -06:00
Emisse
6a8c81bb2b spider and diona hunger balance (#18094) 
* hunger balance

* so true
 2023-07-17 03:07:39 -06:00
eclips_e
01a0e2002a Librarian gameplay (DND, but in SS14) (#17041) 
* D&D character sheets

* Tabletop improvements

* Grass battlemap

* You can now put shit inside of the board

* change variable name

* make the grass tabletop better, again

* update the damn thing AGAIN

* update the shit AGAIN

* You can now take stuff out of tabletops

* Make it use parenting to avoid zany bugs

* MORE battlemaps! Battlemaps for everyone!

* You can now dump out pieces + cleanup

* All (most) non-game pieces should fall to the ground

* make the verb a bit more responsive

* Librarian content officially done

* fix tests i think

* i forgot the sheet

* Smidgen of refactoring

* You can no longer put high risk items inside of boards

* no boardgame defusal

* minor refactoring

* hoplogrma

* doc

* fix rt
 2023-07-17 03:03:18 -06:00
metalgearsloth
73c7ed67fa Add fallback despawning for some effects (#18093) 2023-07-17 18:56:34 +10:00
Ilya246
9261cef915 fire axe plating (#18087) 2023-07-17 01:47:20 -06:00
lzk
a5769429bf Mime satchel (#17986) 2023-07-17 00:51:05 -04:00
Leon Friedrich
541eb417e3 Rename Faction to NpcFaction (#18079) 2023-07-17 13:51:52 +10:00
Flareguy
9a32e4d06a Collectible figurines! (#17993) 
* adds spacemen figurines

* dode dode dode

* dodeulation

* you know what they say

* bunger

* bunger bunger bunger bunger bunger
 2023-07-16 01:07:47 -06:00
Nairod
9d35cd4895 Allowed Dwarves (#18064) 2023-07-16 01:05:31 -06:00
Arendian
84bd21b4a7 Deathrattle implant for uplink and slight tracking implant tweak (#17722) 2023-07-15 22:59:46 -04:00
lzk
ce8e26101f Change QM airlock to use command airlock sprite (#18012) 2023-07-16 12:21:32 +10:00
I.K
0ea6ec118d Make minibomb a little louder. (#18043) 2023-07-15 21:59:09 -04:00
Arendian
040cfe3aae Medibot Fix (#18063) 2023-07-15 13:59:45 -06:00