cyberpresidentvanellope/CHOMPStation2
1
0
Fork 0
mirror of https://github.com/CHOMPStation2/CHOMPStation2.git synced 2026-08-26 22:57:39 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'master' into upstream-merge-10708

Browse Source
This commit is contained in:
Nadyr
2021-06-19 22:03:34 -04:00
committed by GitHub
parent d582dd49aa e3aecf09bb
commit a02607fe5a
394 changed files with 24349 additions and 9994 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/datums/browser.dm
-3
View File
@@ -306,9 +306,6 @@
var/output = {"<form><input type="hidden" name="src" value="\ref[src]"><ul class="sparse">"}
if (inputtype == "checkbox" || inputtype == "radio")
for (var/i in values)
var/div_slider = slidecolor
if(!i["allowed_edit"])
div_slider = "locked"
output += {"<li>
<label class="switch">
<input type="[inputtype]" value="1" name="[i["name"]]"[i["checked"] ? " checked" : ""][i["allowed_edit"] ? "" : " disabled onclick='return false' onkeydown='return false'"]>
code/datums/supplypacks/medical.dm
+2 -1
View File
@@ -66,7 +66,8 @@
/obj/item/weapon/surgical/bonegel,
/obj/item/weapon/surgical/retractor,
/obj/item/weapon/surgical/bonesetter,
/obj/item/weapon/surgical/circular_saw
/obj/item/weapon/surgical/circular_saw,
/obj/item/weapon/surgical/bioregen
)
cost = 25
containertype = /obj/structure/closet/crate/secure/veymed
code/datums/supplypacks/munitions_vr.dm
+2 -18
View File
@@ -2,26 +2,11 @@
name = "Frontier phaser (station-locked) crate"
contains = list(
/obj/item/weapon/gun/energy/locked/frontier = 2,
/obj/item/weapon/gun/energy/locked/frontier/holdout = 1,
/obj/item/weapon/gun/energy/locked/frontier/holdout = 2,
)
cost = 35
containertype = /obj/structure/closet/crate/secure
containername = "frontier phaser crate"
<<<<<<< HEAD
access = access_explorer
||||||| parent of 396032999b... Merge pull request #10708 from TheDavestDave/phaser-handbow
access = access_explorer
/datum/supply_pack/munitions/expeditionbows
name = "Frontier bows (station-locked) crate"
contains = list(
/obj/item/weapon/gun/energy/locked/frontier/handbow=2
)
cost = 20
containertype = /obj/structure/closet/crate/secure
containername = "frontier phaser crate"
access = access_explorer
=======
access = access_explorer
/datum/supply_pack/munitions/expeditionbows
@@ -32,5 +17,4 @@
cost = 20
containertype = /obj/structure/closet/crate/secure
containername = "phaser handbow crate"
access = access_explorer
>>>>>>> 396032999b... Merge pull request #10708 from TheDavestDave/phaser-handbow
access = access_explorer