cyberpresidentvanellope/CHOMPStation2
1
0
Fork 0
mirror of https://github.com/CHOMPStation2/CHOMPStation2.git synced 2025-12-15 04:32:42 +00:00
Code Issues Packages Projects Releases Wiki Activity
21,439 Commits 8 Branches 0 Tags
901bfe7c664836f1efa93cd8ed2ccd05e3fb8eb6
Commit Graph

685 Commits

Author SHA1 Message Date
Iamgoofball
a4737f3b22 Added GRAPE DRANK to the Soda Dispenser. 2013-10-29 16:56:50 -07:00
MDReckless
5a8a629df7 Update drinkingglass.dm 2013-10-28 15:55:54 -04:00
Cael Aislinn
c419717255 tweaks and reworks much of xenoarch including new content and streamlining/cutting down on old content, removes much unused and old content, slight remap of research outpost (see changelog for more details) 
Signed-off-by: Cael Aislinn <cael_aislinn@yahoo.com.au>
 2013-10-29 05:33:23 +10:00
MDReckless
e6d42432ff Changed grape soda description 2013-10-28 15:03:30 -04:00
MDReckless
152d83d47c Update drinkingglass.dm 2013-10-28 15:02:14 -04:00
MDReckless
39d312e69d Removed grape juice from unneeded area 2013-10-28 15:00:21 -04:00
MDReckless
811a4b1aa9 Adds Grape Soda as a reagent 
Allows grape soda in a beaker and gives it color
 2013-10-28 14:57:08 -04:00
MDReckless
809a7faf58 Adding Grapes to the Juicer allow list 
Grapes grown from hydroponics can now be juiced
 2013-10-28 14:45:36 -04:00
MDReckless
67fcd2e6e4 Grape Soda 
Adds grape soda as a recipe
 2013-10-28 11:24:45 -04:00
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
Segrain
93cfba21a7 Fix for #3826. 2013-10-27 21:55:08 +03:00
Iamgoofball
7b1dd38d06 Removed a useless variable, and changed the lists modifications to use += and -= 2013-10-26 22:39:41 -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
Segrain
6cf485deae Quickfix. 2013-10-24 19:13:05 +03:00
Chinsky
1488850ad1 Merge pull request #3803 from Nanai/dev 
Drinks Pack/Spritefixes and Vending Machine Loadout
 2013-10-21 04:30:15 -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
Segrain
121b10b16c Conflict fix. 2013-10-21 04:37:28 +03: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
Segrain
da96d45bc0 Smallfix. 2013-10-17 04:00:33 +03:00
Segrain
6ece0850af Volume fix. 2013-10-17 03:53:03 +03:00
Chinsky
b96f9ef650 Merge pull request #3744 from Baystation12/dev-freeze 
BYOND AKBAR
 2013-10-10 02:45:45 -07:00
Mloc-Argent
65f218ee63 Merge branch 'master' into dev-freeze 
Conflicts:
	code/ZAS/Fire.dm
	html/changelog.html
	maps/tgstation2.dmm

Signed-off-by: Mloc-Argent <colmohici@gmail.com>
 2013-10-08 22:01:16 +01: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
Chinsky
f53fa1dee2 Merge branch 'viro' of https://github.com/Mloc/Baystation12 into viro 
Conflicts:
	code/modules/virus2/disease2.dm
	code/modules/virus2/effect.dm
 2013-10-06 13:34:50 +04:00
Mloc-Argent
9ab11c0aeb virus fixes. WIP will update commit message later 
Signed-off-by: Mloc-Argent <colmohici@gmail.com>
 2013-10-05 18:52:08 +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)
f9906ef76e Styling improvements for Chem Dispenser and DNA Modifier Nano UIs. 
Injector buttons are now disabled when the injector system is not ready.
 2013-09-20 23:08:04 +01:00
Segrain
0b661bc854 Fixes for stacks. 2013-09-19 08:34:38 +03: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
Mark Aherne (Faerdan)
2e957c8b51 Updated the documentation for the ui_interact proc. 
Moved the client nanoclose verb into nanoexternal.dm.

Removed debug comments.
 2013-09-11 22:24:21 +01:00
Mark Aherne (Faerdan)
762baa490f Better documentation for the ui_interact proc. 2013-09-11 21:46:59 +01:00
Mark Aherne (Faerdan)
8a6094685a Minor fixes. Added Templates Guide (wip). 2013-09-11 21:27:54 +01:00
Zuhayr
7ab7a61812 Merge resolution, using dev-freeze map. 2013-09-09 21:59:47 -07:00
Kilakk
0e08e80bb0 Changed syringes and vials to work correctly with the autolathe 2013-09-08 14:24:06 -04:00
Erthilo
3b61ba850f Merge branch 'master' of git://github.com/Baystation12/Baystation12 into dev 
Conflicts:
	baystation12.dme
	code/modules/projectiles/ammunition/bullets.dm
 2013-09-02 23:32:33 +01:00
Erthilo
3662725155 Fixes for monkeycubes. 2013-09-02 17:44:47 +01:00
Erthilo
37acbe9bf7 Fuel tanks uses explode() proc. 2013-09-02 16:10:43 +01:00
Erthilo
c08746206f Merge branch 'dev' of git://github.com/Baystation12/Baystation12 into dev 2013-09-02 12:24:55 +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
c872099e11 Overdose added. Most chemicals over 30 units now cause constant toxic damage. Alcohol tweaked, excessive alcohol is poisonous. Chemistry-Reagents reorganized. Side effects removed. All toxins moved to toxins parent. 2013-09-01 21:23:37 +01:00
Erthilo
469cc55020 Readjusts pill chems due to overdose. Adds pill dissolve logging. 2013-09-01 20:47:54 +01:00
Erthilo
d576997bfa Fuel tanks explode from fire. 2013-09-01 20:10:25 +01:00
Erthilo
74c19d4ec8 Added vacuum flask to bar. 2013-09-01 13:24:13 +01:00