cyberpresidentvanellope/Bubberstation
1
0
Fork 0
mirror of https://github.com/Bubberstation/Bubberstation.git synced 2026-07-18 03:26:31 +01:00
Code Issues Packages Projects Releases Wiki Activity

Gun Cargo Rework: Now with 90% less gun and 100% more stuff the rest of the crew can actually use (#17326)

Browse Source 
* quick reorder

* nakamura part 1

* nakamura finished maybe

* blacksteel does not actually make black steel

* renames the folder, special metals part 2 for blacksteel

* WHERE WE PLAY NOTHING BUT ROCK, ROCK, AND MORE ROCK

* file pathing

* blacksteel done

* nri surplus start

* interest stuff, company flags, nri surplus completion

* deforest medical

* theres gonna be multiple nakamuras actually

* donk co

* the prices are behaving strange

* those are a tad expensive

* im so confused

* ticks the other companies to see if maybe they're responsible

* also maybe that?

* on jod bro they just needed to all be the same name

* kahraman mining tools

* nakamura tools

* nt-bolt defense equipment

* the two g*n companies

* ammo company

* good lord what is happening in there

* STOP TALKING ABOUT GUNS, IM TIRED OF HEARING ABOUT IT

* hopefully the last few bits of gun-centricity (i don think that's a word

* price adjustment

* changes what can be a freebie

* those should be the other way around

* well that'd just make the descriptions incorrect now would it

* 1st batch of changes

* pt2

* oopsies (makes every test fail)

* then king minos told me "DIE" and I was like 💀

* some of those things could cause problems

* they even spelled asbestos wrong

* ultrakrill (funny)

* i hate this dumbass """"""advanced"""""" ammo box thing

* nakamura was a bit hard to get interest from

* not much a fan of how interest goes down

* those mod cores should be cheaper

* again fuck this stupid ''''''''advanced'''''''' ammo box shit

* price adjustment

* misinput

* Update accretion_incompatibility.dm

Co-authored-by: John Doe <gamingskeleton3@gmail.com>
Co-authored-by: Zonespace <41448081+Zonespace27@users.noreply.github.com>
This commit is contained in:
Paxilmaniac
2022-11-23 21:25:17 -05:00
committed by GitHub
parent 4fc4c0429b
commit 683601cd9f
75 changed files with 2121 additions and 1315 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/modules/modular_computers/file_system/programs/budgetordering.dm
+4 -4
View File
@@ -278,11 +278,11 @@
self_paid = !self_paid
. = TRUE
//SKYRAT EDIT START
if("gun_window")
var/datum/component/armament/cargo_gun/gun_comp = computer.GetComponent(/datum/component/armament/cargo_gun)
if("company_import_window")
var/datum/component/armament/company_imports/gun_comp = computer.GetComponent(/datum/component/armament/company_imports)
if(!gun_comp)
computer.AddComponent(/datum/component/armament/cargo_gun, subtypesof(/datum/armament_entry/cargo_gun), 0)
gun_comp = computer.GetComponent(/datum/component/armament/cargo_gun)
computer.AddComponent(/datum/component/armament/company_imports, subtypesof(/datum/armament_entry/company_import), 0)
gun_comp = computer.GetComponent(/datum/component/armament/company_imports)
gun_comp.parent_prog ||= src
gun_comp.ui_interact(usr)
. = TRUE