cyberpresidentvanellope/CHOMPStation2
1
0
Fork 0
mirror of https://github.com/CHOMPStation2/CHOMPStation2.git synced 2025-12-13 11:43:31 +00:00
Code Issues Packages Projects Releases Wiki Activity
14,682 Commits 5 Branches 0 Tags
14ee1bccbb12bf9c85e859df1cf5ac2a328ae10c
Commit Graph

359 Commits

Author SHA1 Message Date
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
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
Zuhayr
46b9d87470 Merge pull request #3621 from alex-gh/multiple_pills 
It is now possible to create multiple pills at once in the Chemmaster
 2013-09-01 04:53:26 -07:00
Zuhayr
1067f083c6 Merge pull request #3625 from Erthilo/dev 
Megaphones, robot health analyzer, eye dropper delay, rigged cells explode in more scenarios
 2013-09-01 04:53:08 -07:00
Zuhayr
332b5fd3e4 Merge pull request #3627 from Faerdan/dev 
Fixed client side UI failure caused by apostrophes in text.
 2013-09-01 04:50:16 -07:00
Mark Aherne (Faerdan)
cffdca9596 Fixed client side UI failure caused by apostrophes in text. 
Updated the Chem Dispenser UI with an Energy bar.

UIs attached to the Chem Dispenser will now update on recharge(), recharge now recharges 1 every 15 ticks instead of 2 every 30 (to make it feel more fluid).
 2013-09-01 00:55:46 +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
Alex
cf829c3cd6 It is now possible to create multiple pills at once in the Chemmaster 2013-08-29 09:55:35 +02:00
Mark Aherne (Faerdan)
ccaa451313 Added Nano UI Chemistry Dispenser. 
Fixed UI update issue with non auto-updating UIs.

Misc tweaks for CSS and JS for UI styling.
 2013-08-28 17:13:25 +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
Zuhayr
2216aed7ce Merge pull request #3582 from alex-gh/add_rezadone 
Ported Rezadone (Heals clone damage without cryo) from tg-station
 2013-08-24 09:56:26 -07:00
Alex
01ac4be991 Ported Rezadone (Heals clone damage without cryo) from tg-station 2013-08-24 18:35:10 +02:00
Mloc-Argent
7ac43fa871 Merge branch 'master' into dev 2013-08-13 22:21:37 +01:00
Mloc-Argent
e2e747fa0a Merge branch 'dev' of github.com:Baystation12/Baystation12 into dev 2013-08-13 22:21:09 +01:00
meyar
e74782bbdb Unfucks pepper spray. IT ACTUALLY DOES THINGS NOW. KO spray replaced with stun/weaken. 2013-08-13 16:51:15 -04: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
375437a6cf Changelog merge. I hate the changelog. 2013-08-12 11:20:41 -07:00
Zuhayr
2ce91a3fbc Commented out gold slime core reactions. 2013-08-10 18:19:41 -07:00
Zuhayr
520d1b34d2 Merge resolution. 2013-08-05 08:00:03 -07:00
Zuhayr
98798ea5fc Compile fixes for organ/reagent code. 2013-08-04 11:25:40 -07:00
Zuhayr
b34effdc4b Merge pull request #3420 from comma/medtweaks 
Liver's delight
 2013-08-03 17:39:21 -07:00