cyberpresidentvanellope/VOREStation
1
0
Fork 0
mirror of https://github.com/VOREStation/VOREStation.git synced 2026-02-03 21:00:19 +00:00
Code Issues Packages Projects Releases Wiki Activity
14,776 Commits 9 Branches 26 Tags
63fb3f29eaafa84b404b92f9bf2c4a10b22bfe8a
Commit Graph

177 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
1f53ed0591 Merge pull request #3722 from Baystation12/master 
Master -> Dev
 2013-09-30 16:01:20 -07:00
Chinsky
62ecc88a1f Fix for #3628 
Stops dead people from sending PDA messages.
 2013-10-01 00:30:12 +04:00
Chinsky
b80006da9c Fix for #3713, dev part 2013-09-30 21:12:22 +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
Segrain
35621466e1 Merge conflict fix. 2013-09-14 22:49:11 +03:00
Segrain
d13f9e617b Fix for #3666. 2013-09-13 19:38:21 +03:00
Zuhayr
7ab7a61812 Merge resolution, using dev-freeze map. 2013-09-09 21:59:47 -07:00
Erthilo
0008d649b0 Silent fix for megaphone. 2013-09-02 12:26:06 +01:00
Erthilo
961ebcec35 Added Megaphones to all Heads offices. 2013-08-31 22:14:31 +01:00
Erthilo
b69c3b2ee4 Change hailer to hearable message. 2013-08-31 22:11:24 +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
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
75f53ba5cd Reverts IA centcomm messaging due to the fax machine. 2013-08-27 22:12:04 +01:00
Erthilo
5437b1bbac Added two ears back. 2013-08-27 22:05:27 +01:00
Erthilo
1fd0522276 Gives Internal Affairs PDA a Message Centcomm option. Shortens Centcomm message time as it wasn't really being abused. Formats Centcomm messages better. 2013-08-27 14:24:12 +01:00
Segrain
475fae2790 Missing comment. 2013-08-21 05:58:07 +03:00
Segrain
2304b743ce Reagent scanner's addition. 2013-08-17 17:00:33 +03:00
Segrain
8456647120 Type check. 2013-08-17 16:58:57 +03:00
Zuhayr
a30f7167bd Removed outdated var, fixed failure to show garbled monkey speech. 2013-08-17 19:03:20 -07:00
Zuhayr
375437a6cf Changelog merge. I hate the changelog. 2013-08-12 11:20:41 -07:00
Erthilo
070cb50f8d PDAs can be used when buckled (and not in any other way restrained or stunned). Rejuvenate now completely heals a target or broken organs and viruses too. 2013-08-11 17:13:58 +01:00
Segrain
c8381b6e90 Pipe painter addition. 2013-07-31 14:23:30 +03:00
Kilakk
bd6b9cceeb Removed the tcomms server for the non-existant mining channel. 2013-07-30 17:39:02 -04:00
Kilakk
3f172dcd08 Changed ERT headsets to correctly show the Supply channel 
* ERT headsets now (correctly) show the Supply channel rather than the two non-existant Cargo/Mining channels.
 2013-07-29 22:31:47 -04:00
comma
1095bd1978 Merge branch 'bleeding-edge-freeze' into viro 2013-07-09 12:49:23 +04:00
Spamcat
87feed7e7b Nice colours (and a minor bugfix) 2013-07-06 02:53:00 +04:00
Spamcat
24eddd6eaa Now 100% more machinery! 2013-07-05 04:12:41 +04:00
Ispil
88791eec5c Makes the Crew Manifest default on all PDAs, and removes the access_manifest variable from cartridges. Also moves the manifest function into the PDA code, instead of cartridge code. 2013-07-02 19:14:10 -07:00
comma
da884f4ddc Merge branch 'bleeding-edge-freeze' of https://github.com/comma/Baystation12 into viro 2013-07-01 17:23:09 +04:00
Chinsky
051edc2227 Started implementing of ViroDB. 
-Analyzers now add info about viruses they scan to global list.
-Health analyzers will only find known viruses.
 2013-06-28 15:43:58 +04:00
meyar
6f84917a58 Merge branch 'master' of https://github.com/Baystation12/Baystation12 2013-06-23 00:17:13 -04:00
Zuhayr
be16c8eff3 Fixes #2957 2013-06-22 20:07:21 -07:00
Spamcat
0dfb5a0583 Whoops :/ 2013-06-19 02:58:26 +04:00
Spamcat
6d6becbeed Made hailers emaggable. 2013-06-19 02:35:32 +04:00
Chinsky
fd13ff0d64 Merge branch 'vials' into viro 2013-06-16 11:22:15 +04:00
Spamcat
076f4c9d9a Figured I should finally commit it, since exams are over now~ 
Radios start off by default. Should decrease the amount of tcomm lag.
 2013-06-11 23:09:44 +04:00
Chinsky
7a8a822a92 Made it possible for mob to be infected with several viruses at once. 2013-06-09 13:31:16 +04:00
jack-fractal
29bffb0c20 Merge branch 'master' into bleeding-edge-freeze 
Conflicts:
	html/changelog.html
 2013-06-06 21:32:08 -04:00
jack-fractal
17b8a2dc8a - reverting a change I hadn't accounted for to the luminosity of the PDA's flashlight 2013-06-06 20:50:22 -04:00
jack-fractal
f4441b5019 refactoring the Stat function for silicon lifeforms 
adding messenger functions to cyborgs and refactoring the AI's IM system
 2013-06-06 20:46:46 -04:00
Zuhayr
df75d25cb3 Map conflict, using BEF. 2013-06-06 10:40:22 +09:30
Zuhayr
9e71180e1b Merge conflict resolution, using BEF. 2013-06-05 14:22:04 +09:30
meyar
11ae345509 Nerfs the PDA flashlight to make the ACTUAL flashlight a viable option. 2013-06-04 18:34:43 -04:00
Aranclanos
799ed74a3c Made the effects of EMP pulses get garbage collected. Less lag on the singularity (around 20 effect del per 5~10 seconds) 2013-06-04 13:47:26 +04:00
Chinsky
d45073a5ab Added new item - hailer. Use in hand to make it say HALT! SECURITY! 
Should help in asking people to halt while running.
 2013-05-28 03:12:58 +04:00
cib
b5217d862a A few fixes to rp-rev 
- Name was empty, hopefully using real_name fixes that
- Announcements coming too quickly
- Fixed icon path issue
 2013-05-23 22:12:20 +02:00