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

5045 Commits

Author SHA1 Message Date
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
Emisse
ed870c5875 remove desword from nukie uplink (#18132) 
* Update uplink_catalog.yml

* blacklist not whitelist real
 2023-07-18 16:23:52 -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
Jackal298
e95350ee5e Small addition to the rewards for expeditions (#17990) 2023-07-18 15:09:14 -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
Chief-Engineer
e0e8394246 update non-command role requirements (#17440) 
* adjust non-head role timers

* double intern role caps

requested by emisse

* reduce base intern requirement to 4 hrs
 2023-07-18 13:04:26 -06:00
Visne
ee4809a222 Revert "Hunger and thirst HUDs" (#18125) 2023-07-18 17:28:28 +02:00
Chief-Engineer
f727a1987e disable round start zombies (#18104) 2023-07-18 04:21:07 -05: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
44e498d522 the squad is in the bag (#18113) 2023-07-17 16:52:59 -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
440d01b487 Saline (#18097) 2023-07-17 20:02:41 +10: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
deltanedas
5d5151c772 prevent rcd destroying planets (#16120) 
Co-authored-by: deltanedas <@deltanedas:kde.org>
 2023-07-16 23:46:35 +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
evilexecutive
f4756067e7 Adding Scrubs to the MediDrobe (#18067) 
* Add files via upload

* Update medidrobe.yml

Oh, there's an entire third scrubs color in the code
 2023-07-16 00:07:33 -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
Arendian
579b0093fa Disposable turret for uplink (#17973) 
* Disposable turret for uplink

* Adjusted firerate and ammo capacity

* Fix funny yaml mistake

* adjust cargo value

* Fix price for real this time

* Made it buyable for scientist traitors
 2023-07-13 22:48:59 -06:00
Vera Aguilera Puerto
9243050e1a Construction graph improvements (#17960) 2023-07-13 20:23:52 +10:00
Nairod
cdf6cbcb3f More tiger markings (#18007) 2023-07-13 00:22:14 -06:00
crazybrain23
480ac253d0 Fix stamp sound (#17955) 
* Convert stamp sounds to mono

* shhh

* something something stamp sounds

* alphabetical is best betical

* the voices
 2023-07-13 00:20:39 -06:00
IProduceWidgets
0e528b1cdf Syndie Axe description clarity (#18004) 
* Update fireaxe.yml

The syndie 'fire axe' already has a lot of drawbacks and is relatively hard to use stealthily, but on the rare occasions you are say an Atmo tech or engi, it should be vaguely possible. This change makes the sprite and name the same as the regular fireaxe, but lets the examine description remain different. 

Blame the sweaty nerds who memorize pixels for making this necessary.

* Clearer syndie fireaxe description

Makes the description detail that the axes are visually distinct.

* Fireaxe Update uplink-catalog.ftl
 2023-07-13 00:19:23 -06:00
Flareguy
fca83aeef3 normalizes atmos tech traitor tc to 20 (#18009) 2023-07-12 22:09:28 -06:00
Nemanja
9029d0a987 Standard issue handguns for security (#18006) 
* Standard issue handguns for security

* fuck it: cadets ball

* change the base gun to rubber bullets

* whoops
 2023-07-12 21:18:57 -06:00
ninruB
e09ec1f165 Everyone in sec starts with filled combat boots (#17959) 
* secoffs with combat shoes (filled)

* cadets with knives wcgw

* det probably doesnt need em but w/e

* yep yep jackboots storag

* i forgt to add whitelist

* blank line moment
 2023-07-12 13:55:18 -06:00
Emisse
65d069a203 sussy toolbox 2tc again (#18000) 
* 2 tc

* digusting
 2023-07-12 13:47:35 -06:00
Emisse
75e5f97446 nerf youtool (#17999) 
* webedit ops

* Update youtool.yml
 2023-07-12 13:47:19 -06:00