mirror of
https://github.com/CHOMPStation2/CHOMPStation2.git
synced 2025-12-13 03:33:21 +00:00
Added a bottle-gripper
Rename To squash
This commit is contained in:
@@ -50,6 +50,15 @@
|
|||||||
/obj/item/weapon/newspaper
|
/obj/item/weapon/newspaper
|
||||||
)
|
)
|
||||||
|
|
||||||
|
/obj/item/weapon/gripper/chemistry
|
||||||
|
name = "chemistry gripper"
|
||||||
|
desc = "A simple grasping tool for chemical work."
|
||||||
|
|
||||||
|
can_hold = list(
|
||||||
|
/obj/item/weapon/reagent_containers/glass,
|
||||||
|
/obj/item/weapon/storage/pill_bottle
|
||||||
|
)
|
||||||
|
|
||||||
/obj/item/weapon/gripper/research //A general usage gripper, used for toxins/robotics/xenobio/etc
|
/obj/item/weapon/gripper/research //A general usage gripper, used for toxins/robotics/xenobio/etc
|
||||||
name = "scientific gripper"
|
name = "scientific gripper"
|
||||||
icon_state = "gripper-sci"
|
icon_state = "gripper-sci"
|
||||||
|
|||||||
@@ -247,6 +247,7 @@ var/global/list/robot_modules = list(
|
|||||||
src.modules += new /obj/item/weapon/reagent_containers/dropper/industrial(src)
|
src.modules += new /obj/item/weapon/reagent_containers/dropper/industrial(src)
|
||||||
src.modules += new /obj/item/weapon/reagent_containers/syringe(src)
|
src.modules += new /obj/item/weapon/reagent_containers/syringe(src)
|
||||||
src.modules += new /obj/item/weapon/gripper/no_use/organ(src)
|
src.modules += new /obj/item/weapon/gripper/no_use/organ(src)
|
||||||
|
src.modules += new /obj/item/weapon/gripper/chemistry(src)
|
||||||
src.modules += new /obj/item/weapon/extinguisher/mini(src)
|
src.modules += new /obj/item/weapon/extinguisher/mini(src)
|
||||||
src.emag = new /obj/item/weapon/reagent_containers/spray(src)
|
src.emag = new /obj/item/weapon/reagent_containers/spray(src)
|
||||||
src.emag.reagents.add_reagent("pacid", 250)
|
src.emag.reagents.add_reagent("pacid", 250)
|
||||||
|
|||||||
36
html/changelogs/Cirra-BottleGripper.yml
Normal file
36
html/changelogs/Cirra-BottleGripper.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: Cirra/
|
||||||
|
|
||||||
|
# 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 a chemistry gripper for Crisis borgs."
|
||||||
Reference in New Issue
Block a user