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

3996 Commits

Author SHA1 Message Date
potato1234_x
07a71aeee9 Adds Atmos Bags (credit to KingFroozy) (#18354) 
* bags

* roundstart bags
 2023-07-27 00:08:24 -06:00
AjexRose
f579818f24 Adding Ammofab (#17538) 2023-07-26 20:41:51 -04:00
lzk
13a2c4ab83 Update gas_tanks.yml (#18335) 2023-07-26 15:29:35 -06:00
chromiumboy
c17518a3e5 Added RadiationBlocker component to reinforced uranium windows (#18346) 2023-07-26 15:28:45 -06:00
MishaUnity
325d2a39ee add mass-media system (#18251) 
* Add Console, PDA news tab, and ringstone popup

* Add English localization

* Add mass-media console board to Advanced Entertainment resrarch

* Fix misprint

* Deleting unused libraries

* Fix round restart problem

* Fixing restart problem

* Just another fix

* Сode optimization

* Code optimization
 2023-07-26 12:49:38 -06:00
Hebi
151f1c1f40 Locking the implanter (#18324) 2023-07-26 12:41:28 -06:00
metalgearsloth
b478d5326b Remove component.Initialize calls (#18230) 2023-07-26 22:37:52 +10:00
Emisse
44d7284cd1 monky (#18325) 2023-07-26 04:02:01 -06:00
Nairod
aec3e18502 Senior Roles (#18181) 
* Senior Roles

* Senior Researcher and first wave of touch-ups

* Senior Physician and second wave of touch ups

* Senior Officer and third wave of clean ups

* Fourth wave of touch ups

* Playtimetracker fix, I hope

* Supervisor adjustment

* Sci assistant supervisor fix.

* Allow antags for all except Senior Officer.
 2023-07-25 21:06:31 -06:00
Emisse
31607a0be0 hardsuit/firesuit cleanup (#18308) 
* real

* hjoly fuck you guy sare annoying

* fix cargo arbitrage idk why tf it changed from editing armor values but fuck my life i guess

* why god

* Update suits.yml

* Update cargo_emergency.yml
 2023-07-25 18:34:59 -06:00
deltanedas
063f75ca29 let animals drink things (#18236) 
* thirst .Owner removal

* thirst file scope

* drink update + minor refactor

* drink file scope

* let animals drink things

* dont eat/drink when dont need to

* admeme mouse override

* moo

---------

Co-authored-by: deltanedas <@deltanedas:kde.org>
 2023-07-25 15:32:10 -06:00
Jackal298
ba372894f0 Spiret fix modular receiver and rifle stock (#18262) 
Reupload
 2023-07-25 15:29:56 -06:00
AjexRose
7ef7fb2096 Retexture of command crate (#18294) 2023-07-25 14:18:01 -06:00
Pieter-Jan Briers
28fff33b54 Speed up observers (#18264) 2023-07-25 10:33:01 +10:00
deltanedas
88eaf7a772 dragon minor refactor and stuff (#18149) 
Co-authored-by: deltanedas <@deltanedas:kde.org>
 2023-07-25 10:32:12 +10:00
Arendian
72ba5014b6 Return of the medicinal cigarette (#18215) 2023-07-24 17:02:30 -06:00
Flareguy
23ab5b8f3f Reworks the Python to match the SS13 .357 (#18197) 
* buffs the python to replicate /tg/ stats

* meta.json shits

* fuc

* fix attributions.yml

* yaml linter fix?

* fix fill
 2023-07-24 17:02:15 -06:00
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