mirror of
https://github.com/CHOMPStation2/CHOMPStation2.git
synced 2025-12-11 18:53:06 +00:00
Merge pull request #6343 from Nalarac/Circuits
Fixes Integrated Circuit Printer Taking Fractions of a Sheet
This commit is contained in:
@@ -44,7 +44,7 @@
|
|||||||
if(num < 1)
|
if(num < 1)
|
||||||
to_chat(user, span("warning", "\The [src] is too full to add more metal."))
|
to_chat(user, span("warning", "\The [src] is too full to add more metal."))
|
||||||
return
|
return
|
||||||
if(stack.use(num))
|
if(stack.use(max(1, round(num)))) // We don't want to create stacks that aren't whole numbers
|
||||||
to_chat(user, span("notice", "You add [num] sheet\s to \the [src]."))
|
to_chat(user, span("notice", "You add [num] sheet\s to \the [src]."))
|
||||||
metal += num * metal_per_sheet
|
metal += num * metal_per_sheet
|
||||||
interact(user)
|
interact(user)
|
||||||
|
|||||||
36
html/changelogs/Nalarac- Circuit Intake.yml
Normal file
36
html/changelogs/Nalarac- Circuit Intake.yml
Normal file
@@ -0,0 +1,36 @@
|
|||||||
|
################################
|
||||||
|
# Example Changelog File
|
||||||
|
#
|
||||||
|
# Note: This file, and files beginning with ".", and files that don't end in ".yml" will not be read. If you change this file, you will look really dumb.
|
||||||
|
#
|
||||||
|
# Your changelog will be merged with a master changelog. (New stuff added only, and only on the date entry for the day it was merged.)
|
||||||
|
# When it is, any changes listed below will disappear.
|
||||||
|
#
|
||||||
|
# Valid Prefixes:
|
||||||
|
# bugfix
|
||||||
|
# wip (For works in progress)
|
||||||
|
# tweak
|
||||||
|
# soundadd
|
||||||
|
# sounddel
|
||||||
|
# rscadd (general adding of nice things)
|
||||||
|
# rscdel (general deleting of nice things)
|
||||||
|
# imageadd
|
||||||
|
# imagedel
|
||||||
|
# maptweak
|
||||||
|
# spellcheck (typo fixes)
|
||||||
|
# experiment
|
||||||
|
#################################
|
||||||
|
|
||||||
|
# Your name.
|
||||||
|
author: Nalarac
|
||||||
|
|
||||||
|
# Optional: Remove this file after generating master changelog. Useful for PR changelogs that won't get used again.
|
||||||
|
delete-after: True
|
||||||
|
|
||||||
|
# Any changes you've made. See valid prefix list above.
|
||||||
|
# INDENT WITH TWO SPACES. NOT TABS. SPACES.
|
||||||
|
# SCREW THIS UP AND IT WON'T WORK.
|
||||||
|
# Also, all entries are changed into a single [] after a master changelog generation. Just remove the brackets when you add new entries.
|
||||||
|
# Please surround your changes in double quotes ("), as certain characters otherwise screws up compiling. The quotes will not show up in the changelog.
|
||||||
|
changes:
|
||||||
|
- bugfix: "Integrated circuit printers no longer take fractions of a sheet."
|
||||||
Reference in New Issue
Block a user