cyberpresidentvanellope/Paradise
1
0
Fork 0
mirror of https://github.com/ParadiseSS13/Paradise.git synced 2026-08-23 12:07:27 +01:00
Code Issues Packages Projects Releases Wiki Activity

Reworks some trader pools. (#22969)

Browse Source 
* oh boy let us have some heads roll

* le comma au chocolate

* perhaps we we want them to be able to build it

* mmm ice cream sandwich cereal

* Update code/game/objects/items/weapons/storage/boxes.dm

Co-authored-by: Henri215 <77684085+Henri215@users.noreply.github.com>

* Update code/game/objects/items/weapons/storage/boxes.dm

Co-authored-by: Burzah <116982774+Burzah@users.noreply.github.com>

* lablled

* Apply suggestions from code review

Co-authored-by: Henri215 <77684085+Henri215@users.noreply.github.com>

* solcase

---------

Co-authored-by: Henri215 <77684085+Henri215@users.noreply.github.com>
Co-authored-by: Burzah <116982774+Burzah@users.noreply.github.com>
This commit is contained in:
Qwertytoforty
2023-10-29 10:18:35 +00:00
committed by GitHub
co-authored by Henri215 Burzah
parent 7474cf10aa
commit 3dc52b9f1f
5 changed files with 55 additions and 29 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/game/objects/items/devices/scanners.dm
+2 -2
View File
@@ -614,8 +614,8 @@ REAGENT SCANNER
var/printing = FALSE
var/time_to_use = 0 // How much time remaining before next scan is available.
var/usecharge = 750
var/scan_time = 10 SECONDS //how long does it take to scan
var/scan_cd = 60 SECONDS //how long before we can scan again
var/scan_time = 5 SECONDS //how long does it take to scan
var/scan_cd = 30 SECONDS //how long before we can scan again
/obj/item/bodyanalyzer/get_cell()
return cell
code/game/objects/items/weapons/storage/boxes.dm
+16
View File
@@ -556,6 +556,22 @@
B.reagents.add_reagent(reag, 30)
B.name = "[reag] bottle"
/obj/item/storage/box/botany_labelled_seeds
name = "botanist labelled random seeds kit"
desc = "A box intended for experienced botanists."
/obj/item/storage/box/botany_labelled_seeds/populate_contents()
for(var/I in 1 to 7)
new /obj/item/seeds/random/labelled(src)
/obj/item/storage/box/telescience
name = "babies first telescience kit"
desc = "A now restricted kit for those who want to learn about telescience!"
/obj/item/storage/box/telescience/populate_contents()
new /obj/item/circuitboard/telesci_pad(src)
new /obj/item/circuitboard/telesci_console(src)
/obj/item/storage/box/mousetraps
name = "box of Pest-B-Gon mousetraps"
desc = "<B><FONT color='red'>WARNING:</FONT></B> <I>Keep out of reach of children</I>."