cyberpresidentvanellope/S.P.L.U.R.T-Station-13
1
0
Fork 0
mirror of https://github.com/SPLURT-Station/S.P.L.U.R.T-Station-13.git synced 2025-12-10 09:54:52 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'upstream/master' into AnPrimAssistants

Browse Source
This commit is contained in:
lolman360
2020-09-01 11:23:57 +10:00
parent 4d6fb10dff e652591639
commit 05bd0579ca
520 changed files with 18663 additions and 10921 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
code/modules/mining/aux_base.dm
View File

@@ -70,7 +70,6 @@ interface with the mining shuttle at the landing site if a mobile beacon is also
var/datum/browser/popup = new(user, "computer", "base management", 550, 300) //width, height
popup.set_content("<center>[dat]</center>")
popup.set_title_image(usr.browse_rsc_icon(src.icon, src.icon_state))
popup.open()

5
code/modules/mining/lavaland/necropolis_chests.dm
View File

@@ -78,10 +78,7 @@
if(28)
new /obj/item/clothing/neck/necklace/memento_mori(src)
if(29)
if(prob(50))
new /obj/item/malf_upgrade(src)
else
new /obj/item/disk/tech_disk/illegal(src)
new /obj/item/disk/tech_disk/illegal(src)
//KA modkit design discs
/obj/item/disk/design_disk/modkit_disc