Cinka/OldThink
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity
17,787 Commits 1 Branch 0 Tags
b1e7f877dcb1188994f8b474b31c2a3c46b4cb8a
Commit Graph

10797 Commits

Author SHA1 Message Date
Emisse
b1e7f877dc nukie planet update (#18141) 
* nukie planet update

* cute floor
 2023-07-19 00:54:18 -06:00
PJBot
f4b14909fc Automatic changelog update 2023-07-19 02:06:58 -04: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
PJBot
5ddb9c9fc9 Automatic changelog update 2023-07-18 18:56:33 -04:00
Emisse
e393eedd09 captains sword reflect chance (#18133) 2023-07-18 16:55:29 -06:00
PJBot
5ce8fdbb16 Automatic changelog update 2023-07-18 18:24:57 -04: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
PJBot
4a3831c7b1 Automatic changelog update 2023-07-18 17:12:47 -04:00
PJBot
a5c5c761e5 Automatic changelog update 2023-07-18 17:11:11 -04: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
PJBot
fecfe8e497 Automatic changelog update 2023-07-18 17:04:17 -04:00
c4llv07e
4b5ab1e2d2 Add machine frame completion feedback (#18048) 
Signed-off-by: c4llv07e <kseandi@gmail.com>
 2023-07-18 15:03:13 -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
PJBot
ce2d21ef6f Automatic changelog update 2023-07-18 16:57:57 -04: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
PJBot
7c32067079 Automatic changelog update 2023-07-18 16:56:22 -04:00
Emisse
925971472f box update (#18129) 2023-07-18 14:39:45 -06:00
Emisse
487487811b packed update (#18128) 
* packed update

* packed update
 2023-07-18 14:37:29 -06:00
PJBot
d81fef8eaa Automatic changelog update 2023-07-18 15:05:30 -04: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
Nemanja
aa40a21aab attribute RamZ for zombie icon (#18121) 2023-07-18 09:44:35 -04:00
PJBot
aad54bf498 Automatic changelog update 2023-07-18 07:45:07 -04:00
PJBot
150d3c9a8e Automatic changelog update 2023-07-18 07:15:35 -04:00
PJBot
f594403fe8 Automatic changelog update 2023-07-18 05:22:11 -04:00
Chief-Engineer
f727a1987e disable round start zombies (#18104) 2023-07-18 04:21:07 -05:00
PJBot
0617c06af8 Automatic changelog update 2023-07-18 02:02:25 -04: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
PJBot
7ffa69be90 Automatic changelog update 2023-07-18 01:59:03 -04:00
Pieter-Jan Briers
23966e1dff PA Fixes (#18116) 
* PA Fixes

Fix exception when opening UI if it has the power limiter warning displayed.

Fix it sometimes not detecting parts due to angles not getting normalized before comparison.

* Fix swapped out sprites for PA emitter P0 states
 2023-07-17 23:57:59 -06:00
PJBot
a356d9b1fd Automatic changelog update 2023-07-17 18:53:50 -04: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
PJBot
5767f1639d Automatic changelog update 2023-07-17 15:49:14 -04: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
PJBot
d6377ae0a2 Automatic changelog update 2023-07-17 15:38:37 -04: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
PJBot
ed455862ff Automatic changelog update 2023-07-17 15:32:38 -04: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
PJBot
20874e44da Automatic changelog update 2023-07-17 15:19:15 -04:00
Arendian
0dfa31ce0b fix diona hunger decay rate (#18108) 2023-07-17 13:18:11 -06:00