mirror of
https://github.com/CHOMPStation2/CHOMPStation2.git
synced 2025-12-16 05:02:42 +00:00
changelog and chemmaster fix
This commit is contained in:
@@ -89,7 +89,7 @@
|
|||||||
data["condi"] = condi
|
data["condi"] = condi
|
||||||
|
|
||||||
if(loaded_pill_bottle)
|
if(loaded_pill_bottle)
|
||||||
data["pillBottle"] = list("total" = loaded_pill_bottle.contents.len, "max" = loaded_pill_bottle.storage_slots)
|
data["pillBottle"] = list("total" = loaded_pill_bottle.contents.len, "max" = loaded_pill_bottle.max_storage_space)
|
||||||
else
|
else
|
||||||
data["pillBottle"] = null
|
data["pillBottle"] = null
|
||||||
|
|
||||||
@@ -238,7 +238,7 @@
|
|||||||
P.icon_state = "pill"+pillsprite
|
P.icon_state = "pill"+pillsprite
|
||||||
reagents.trans_to_obj(P,amount_per_pill)
|
reagents.trans_to_obj(P,amount_per_pill)
|
||||||
if(src.loaded_pill_bottle)
|
if(src.loaded_pill_bottle)
|
||||||
if(loaded_pill_bottle.contents.len < loaded_pill_bottle.storage_slots)
|
if(loaded_pill_bottle.contents.len < loaded_pill_bottle.max_storage_space)
|
||||||
P.loc = loaded_pill_bottle
|
P.loc = loaded_pill_bottle
|
||||||
|
|
||||||
else if (href_list["createbottle"])
|
else if (href_list["createbottle"])
|
||||||
|
|||||||
37
html/changelogs/Sin4_UIs.yml
Normal file
37
html/changelogs/Sin4_UIs.yml
Normal file
@@ -0,0 +1,37 @@
|
|||||||
|
################################
|
||||||
|
# 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: Sin4
|
||||||
|
|
||||||
|
# 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:
|
||||||
|
- rscadd: "Added NanoUI for Advanced Body Scanners, Arcade, Atmospherics Control Computer, Chemmaster, Cloning Console, Fax Machines, Guestpass Console, Holodeck Computer, Laptop Vendors, Operating Computer, and Photocopiers."
|
||||||
|
- bugfix: "Fixes chemmaster not putting pills in pill bottles."
|
||||||
Reference in New Issue
Block a user