cyberpresidentvanellope/CHOMPStation2
1
0
Fork 0
mirror of https://github.com/CHOMPStation2/CHOMPStation2.git synced 2025-12-12 19:22:56 +00:00
Code Issues Packages Projects Releases Wiki Activity
14,790 Commits 9 Branches 0 Tags
a4e5bad4098b901bab0594fccf921ebaf831e4fe
Commit Graph

162 Commits

Author SHA1 Message Date
Iamgoofball
3fa88bb7ff Fixed beakers not going into DNA scannners. 2013-10-27 13:13:26 -07:00
Iamgoofball
e58438cae8 Fixed the Glass.dm can_be_placed_into list. 2013-10-27 13:09:12 -07:00
Iamgoofball
f7ad7cbddb Actually added the new beakers. Yay for git. 2013-10-26 21:57:26 -07:00
Iamgoofball
cfbe1c6ad1 Added the Booze Dispenser, the Soda Dispenser, the Bluespace Beaker, and the Cryostasis Beaker. 2013-10-26 21:52:13 -07:00
Nanai
4c01ecaee4 Fixed iced tea, adds canned ice tea and grape juice, adds grape juice, melon liquor, blue curacao, grenadine, poisonous wine. rebalances absinthe, and places it within the vendor. 2013-10-21 07:11:40 -04:00
ZekeSulastin
3455bf7cc1 Add/remove beaker from sleeper for dialysis 
Redoes the sleeper attackby() prompt to match cryo's style.  Also
removes the millionbeaker in favor of a standard large.
 2013-10-19 17:03:13 -04:00
Nanai
752f9f80eb Merge branch 'dev' of https://github.com/Baystation12/Baystation12 into uguu 2013-10-19 13:13:02 -04:00
Chinsky
7555dd0f0b Merge branch 'master' into dev 
Conflicts:
	code/setup.dm
 2013-10-08 15:16:57 +04:00
Mloc-Argent
ebf2ba2d4a Fixes. 
Made glowshrooms and intercoms not use a ridiculous internal loop, and fixed a pickup luminosity bug with glowshrooms.
fixes #3708
Fixes #3718
Fixes #3702

Signed-off-by: Mloc-Argent <colmohici@gmail.com>
 2013-10-07 20:35:26 +01:00
Mloc-Argent
8b2c3fc153 Massive click code rework by SuperSayu, ported from TG. 
Full details at https://github.com/tgstation/-tg-station/pull/1206
Fixes #3648

Signed-off-by: Mloc-Argent <colmohici@gmail.com>
 2013-10-07 20:24:21 +01:00
Nanai
f78800a248 Minor Food Fix: Made basic salad nonhallucinogenic, uses 2 cabbage 1 tomato 1 carrot 1 apple for recipe. Moved Valid Salad's Doctor's Delight to the Aesir Salad. 2013-09-30 02:02:49 -04:00
Mloc
49c0a30301 Merge branch 'master' into dev 
Conflicts:
	baystation12.dme
	html/changelog.html
 2013-09-26 10:26:03 +01:00
Mloc-Argent
e9bf414820 Refactors code to work with BYOND 500. 
500 adds a "color" var to /atom, which conflicts with /obj/item/color, /obj/atmospherics/color and various simple_animals.
  /obj/item/color is now item_color
  /obj/atmospherics/color is now pipe_color
  simple_animals color is now body_color
Removes transformer.dm since it conflicted with transform() and was never used.

Signed-off-by: Mloc-Argent <colmohici@gmail.com>
 2013-09-22 12:39:48 +01:00
Mark Aherne (Faerdan)
e0924bf4ab Multiple minor updates to Nano. 
Created new DNA Modifier Nano UI.

Refactored the DNA Modifier code.
 2013-09-19 01:39:59 +01:00
Kilakk
0e08e80bb0 Changed syringes and vials to work correctly with the autolathe 2013-09-08 14:24:06 -04:00
Erthilo
3662725155 Fixes for monkeycubes. 2013-09-02 17:44:47 +01:00
Mloc-Argent
a084f74c7d Expansion of every "icon = ''" path. 
Supposed to help compilation times.  Who knows.

Signed-off-by: Mloc-Argent <colmohici@gmail.com>
 2013-09-01 21:53:36 +01:00
Erthilo
469cc55020 Readjusts pill chems due to overdose. Adds pill dissolve logging. 2013-09-01 20:47:54 +01:00
Erthilo
74c19d4ec8 Added vacuum flask to bar. 2013-09-01 13:24:13 +01:00
Erthilo
03b716e0cd Adds delay to eye dropper. 2013-08-31 22:10:52 +01:00
Erthilo
547c1e670d Adds janitorial cart from tg, replacing janicart. Adds in some NanoUI stuff to make it work. 2013-08-31 20:12:19 +01:00
Erthilo
b75d97a488 Merge branch 'master' of git://github.com/Baystation12/Baystation12 into dev 
Conflicts:
	code/game/machinery/kitchen/gibber.dm
	code/modules/mob/living/carbon/human/inventory.dm
	code/modules/reagents/reagent_containers/hypospray.dm
	maps/tgstation2.dmm
 2013-08-31 17:45:31 +01:00
Erthilo
a7f1b50f1b Fixes reagent and throw logging. 2013-08-30 00:38:10 +01:00
Erthilo
0cb361f737 Removed undeeded "ATTACK:" 2013-08-28 03:37:11 +01:00
Erthilo
3fbdc99079 Standardises logging. All attack logs now print in main logs. Added stripping and syringe logging. Added Jump commands to most attack logs. 2013-08-28 03:33:04 +01:00
Erthilo
5f68a4c656 Misc formatting errors. 2013-08-27 22:10:47 +01:00
Segrain
3ba5c3e450 Compile fix. 2013-08-13 13:47:22 +03:00
Segrain
6122d50ce0 Reverting to as advertised. 2013-08-13 09:25:28 +03:00
Erthilo
1228ba8a25 Allows autoinjectors to be refilled. 2013-08-12 21:17:16 +01:00
Zuhayr
520d1b34d2 Merge resolution. 2013-08-05 08:00:03 -07:00
comma
747c71096e Fixed monkeys not getting space rabies via syringes. 2013-08-04 00:32:37 +04:00
comma
c8f5b98a95 Autoinjectors. 
Now they are one-use, as they were intended.
You can still change their contents with syringes before they are used.
To mitigate their one-use nature, box of them is added to medical closets and supply pack.
 2013-08-01 08:12:56 +04:00
Mloc-Argent
e7f38be3b4 Beakers and other glass containers now hide their contents, only showing the amount. 
Additionally, they can be labeled with a pen, up to a max of 10 characters.

Signed-off-by: Mloc-Argent <colmohici@gmail.com>
 2013-07-22 17:38:34 +01:00
comma
50f94ddd93 Merge branch 'bleeding-edge-freeze' into viro 2013-07-01 17:33:24 +04:00
comma
da884f4ddc Merge branch 'bleeding-edge-freeze' of https://github.com/comma/Baystation12 into viro 2013-07-01 17:23:09 +04:00
Zuhayr
1d28bb7cb3 Message tweaks. 2013-06-28 15:55:41 -07:00
Zuhayr
f5abc3e041 Syringes now have an increased delay when injecting through a hardsuit. 2013-06-27 17:59:37 -07:00
Zuhayr
7a9b501bc0 Dartgun tweaks, vials. 2013-06-24 02:04:44 -07:00
jack-fractal
4045df96a5 - renaming existing "tea" icon to hot_coco 
- adding "teacup" icon
- revising icon-state for hot coco and tea
 2013-06-19 00:47:12 -04:00
Chinsky
a3587dc81d Adds new virology machine - centrifuge. 
Used for extracting virus samples or antibodies.
Accepts only vials.
 2013-06-19 02:33:32 +04:00
Chinsky
ca4c3869b9 Merge branch 'bleeding-edge-freeze' into vials 2013-06-16 11:20:45 +04:00
Chinsky
a76b87635e It only holds 15 units. 2013-06-15 15:54:43 +04:00
Jamini
89766706fe Alien Monkeys - Farwa, Stok, Aenera 
Signed-off-by: Jamini <mobiousjami@gmail.com>
 2013-06-14 02:22:27 -04:00
Mordeth221
91bd0d453b Cyborg Medical Hypo Changing Doctors Delight to Tricordrazine 
Changing because they have the same effect, yet Doctors Delight causes people to get drunk/slurr words.
 2013-06-12 21:55:07 +02:00
Chinsky
59834d2ed9 Added new reagent container - vial. 
basically 15u beaker.
 2013-06-08 12:39:03 +04:00
Chinsky
f9b0ba7a49 Added lids for bottles and beakers. 
Click on vessel in hand to put lid on / take it off.
Lids prevent use of syringes and spilling.
 2013-05-26 06:38:38 +04:00
VitrescentTortoise
afb49c05d9 Fixed lemonjuice showing up as ..what? 2013-05-25 12:52:56 -07:00
cib
670bf5bb76 Radiation storms consider maintenance now. 
Also, a fix to spray(whoops!)
 2013-05-18 22:18:37 +02:00
cib
d7cc42e588 Added wallrot event. 
Also some updates to changelog.
 2013-05-18 21:55:02 +02:00
jediluke69
85eb0f1224 Adds new drinks and fixes a few things 2013-04-24 18:49:01 -04:00