Commit Graph

6427 Commits

Author SHA1 Message Date
Emil
e82a06fc68 Update mind.dm
Should fix #1870 where href-crap was saved in the adminlogs.
2013-11-28 15:55:01 +01:00
Giacom
618b41ea08 Merge pull request #1549 from Atskadan/grammarfix
Fixes several errors in the cap gun's text
2013-10-11 07:30:17 -07:00
Giacom
9b7a1bec2a Merge pull request #1535 from Incoming5643/StaffAnimation
Repairs and Expands the Staff of Change
2013-10-11 07:28:58 -07:00
Giacom
5a66229d70 Merge pull request #1529 from Miauw62/ifuckedupmmis
More MMI fixes [Nope still not ready]
2013-10-11 07:25:49 -07:00
Cheridan
fc82725d87 Merge pull request #1514 from Giacomand/rampant_tweak
Tweaked the brand intelligence event to use the mimic copy class.
2013-10-10 16:28:19 -07:00
Cheridan
692f5e3d02 Merge pull request #1505 from Giacomand/disposalsfixes
Fixed disposal units not starting with full pressure.
2013-10-10 16:12:23 -07:00
MrPerson
38fe6d7a02 Merge pull request #1542 from Giacomand/remove_radio_icon
Removed the radio icon from radio chat.
2013-10-10 15:31:07 -07:00
Atskadan
b9b5f3fbcd Changes \a to the, since the game never says anything like "you fire A laser gun", etc
consistency
2013-10-10 17:06:43 -05:00
Giacomand
de20a961b1 Merge pull request #1536 from Jordie0608/X-ray
Xray guns unique and buildable
2013-10-10 14:31:59 -07:00
Giacomand
aa54ceeb14 Merge pull request #1540 from Incoming5643/spooky
2SPOOKY
2013-10-10 14:13:44 -07:00
Giacomand
3b958ebb54 Merge pull request #1500 from AstralSerpent/master
Crayons can now be grinded down for coloured crayon powder, which can be...
2013-10-10 11:59:54 -07:00
Atskadan
3c901165ae Changes "cap gun" in the firing message to [src], so if the gun is renamed, it will retain that name. 2013-10-10 00:47:06 -05:00
Atskadan
a59122ed0d Fixes several errors in the cap gun's text, including every instance of "capss" and a sentence that used "is" instead of "are". 2013-10-09 23:54:23 -05:00
Aranclanos
c62f5cd8d7 Merge pull request #1527 from Mloc/tg-fix2
Small fixes, a new atom flag, a fix for alt-gr, and some cyborg changes.
2013-10-09 13:15:52 -07:00
Aranclanos
ee35e83494 Small changes for cael's shuttle loan event 2013-10-09 16:44:52 -03:00
Giacomand
838b1167ba * Removed the radio icon from radio chat. 2013-10-09 20:14:14 +01:00
Aranclanos
b6e1fc6d95 Merge branch 'terbs_weekly_fun' of https://github.com/caelaislinn/-tg-station into terbs_weekly_fun
Conflicts:
	code/controllers/supply_shuttle.dm
2013-10-09 16:03:39 -03:00
Miauw
6bf4e381e7 Fixed cyborgs starting without a brain in their MMI. 2013-10-09 19:23:02 +02:00
Giacomand
c6df325069 Merge pull request #1504 from Incoming5643/wizardreport
Wizards will now show everyone their spells in the round end report
2013-10-09 09:38:26 -07:00
Giacomand
4ff9db9281 Merge pull request #1526 from AnturK/smallfix
Fix for #1317
2013-10-09 09:36:25 -07:00
Giacomand
723bd6b386 Merge pull request #1532 from Cheridan/omnom
Adds copypasta!
2013-10-09 00:19:36 -07:00
Jordie
416cbee62c Xrays shoot everything but walls 2013-10-09 18:05:33 +11:00
Incoming
feedac9505 Add a special always run event for halloween where the entire crew bursts into skeletons after a short while.
This has no real effect on anything besides the fact that skeletons can use the rarely touched xylophone var.
Adds a pair of usr checks for corgis so events can place things on their head without incuring a runtime (the chrismas event also does this)
2013-10-08 22:38:03 -04:00
MrPerson
0c724c2a7c Merge pull request #1531 from Giacomand/1530fix
Fixes #1530. It was using a list that you couldn't get dead mobs from.
2013-10-08 13:40:11 -07:00
Incoming
f36507723a Fixes my extra side of potatos
Removes the !isanimal and !isrobot checks from robot creation. A fix has been suggested for the pull currently dealing with MMI that will stop the runtimes. https://github.com/tgstation/-tg-station/pull/1529
Keep in mind that if that request is not ultimately pulled the fix will need to be added to this pull to prevent runtimes from the game trying to take DNA from non-carbon based life.
2013-10-08 16:04:38 -04:00
Mloc-Argent
d2e8531ee5 Made cyborg middle-clicks cycle through the list of selected modules, and added some new helper procs for selected modules.
New procs:
* module_selected(module) - Checks whether the module slot specified by "module" is currently selected.
* module_active(module) - Checks whether there is a module active in the slot specified by "module".
* get_selected_module() - Returns the slot number of the currently selected module.  Returns 0 if no modules are selected.
* select_module(module) - Selects the module slot specified by "module"
* deselect_module(module) - Deselects the module slot specified by "module"
* toggle_module(module) - Toggles the selection of the module slot specified by "module".
* cycle_modules() - Cycles through the list of selected modules.

Signed-off-by: Mloc-Argent <colmohici@gmail.com>
2013-10-08 20:15:57 +01:00
Mloc-Argent
db0a908038 Make energy weapons not get a bloody overlay and fixed alt-gr not calling AltClick()
Signed-off-by: Mloc-Argent <colmohici@gmail.com>
2013-10-08 20:15:56 +01:00
Mloc-Argent
9de132a0a3 Small fixes and a new atom flag.
* Fixes the ( shaped cyan wire
* Fixes a luminosity bug with glowshrooms.
* Changes a ridiculous internal loop in intercoms to use the MC.
* Makes intercoms not be bloodied by bloody hands.
* Adds a "NOBLOODY" flag for atoms that don't want to be bloodied.

Signed-off-by: Mloc-Argent <colmohici@gmail.com>
2013-10-08 20:15:55 +01:00
AstralSerpent
535050fd3b Returned /proc/mix_color_from_reagents(var/list/reagent_list) to normal, so crayons mix like normal reagents. 2013-10-09 05:45:00 +11:00
Jordie
272038e2e7 Xray guns unique and buildable 2013-10-09 01:31:39 +11:00
Incoming
9fb9ed20ed Repairs and expands the staff of change:
*Staff of change now has a 20% chance of turning you into a simple animal (all have been tested to make sure they're properly controllable.
*Staff of change now works on simple animals, adding on_hit doesn't double up damage on simple animals or try to inflict non-brute damage because it's hardcoded to avoid inflicting damage to animals in the generic projectile. Special guns seem to work fine on animals (like the syringe gun for example).
*Mutant races were not updating properly thanks the DNA revamp, so that's been fixed and expanded to include all current races.
*Transfering identity for MMI's in newly created robots has been disabled for animal -> robot because it doesn't work properly for them, robot -> robot also apparently NEVER worked and has likewise been disabled.
2013-10-07 21:41:42 -04:00
Cheridan
19470fc542 Adds copypasta!
Adds copypasta!
2013-10-07 17:27:12 -05:00
MrPerson
5347cac68a Merge pull request #1494 from Giacomand/clickmobopt
Hostile Mobs Attacking Through Window Fix
2013-10-07 12:55:04 -07:00
Giacomand
cbb395dc02 * Added the same for the AI and Cyborg click code. 2013-10-07 20:47:55 +01:00
Giacomand
7013175ec4 * Fixes #1530. It was using a list that you couldn't get dead mobs from! 2013-10-07 20:31:40 +01:00
Miauw
1072aecd24 Fixed being able to vaporize brains by sticking a brain into an occupied MMI. Fixed no message being displayed when putting a brain into an MMI. Removed some colon operators. 2013-10-07 19:45:08 +02:00
Aranclanos
da07db8227 Merge pull request #1513 from Malkevin/galoshesB
Galoshes B: Janicart crate comes with galoshes
2013-10-07 07:17:51 -07:00
Giacomand
796f3ca9f1 Merge pull request #1517 from Mloc/tg-byond500
[MAP] Refactors the code to work with BYOND 500.  Big commit.
2013-10-07 07:05:46 -07:00
AnturK
3ae17adf6e Fix for #1317 2013-10-07 09:08:35 +02:00
Incoming
64625e067a Makes spell reporting a bit more slim 2013-10-06 20:40:37 -04:00
Aranclanos
d062009a6e Merge pull request #1507 from Giacomand/napalm
Napalm works again, which fixes incendiary grenades.
2013-10-06 17:01:46 -07:00
Giacomand
ef41ccf5da * Removed SPAWN_COLD 2013-10-07 00:55:52 +01:00
EuroNumbers
45f89c064c Merge pull request #1521 from Intigracy/noreactflag
NOREACT flag fix
2013-10-06 16:43:37 -07:00
Intigracy
3681601b1b There's still discussion to be had before this gets merged. 2013-10-06 16:39:02 -07:00
Aranclanos
f4972ee3a4 Merge pull request #1503 from Giacomand/lockersuffocation
Fixes lockers suffocating you in 5 minutes. Fixes #1227
2013-10-06 16:24:26 -07:00
Giacomand
d36535a433 * Removed the spawn fuel option. 2013-10-07 00:20:35 +01:00
Aranclanos
5b2f3b34d9 Merge pull request #1476 from ACCount12/noreact
[DISCUSSION/DO NOT MERGE] NOREACT removed from mobs
2013-10-06 16:17:09 -07:00
Giacomand
acec04c001 Merge pull request #1483 from Ergovisavi/ied_fix
Fixes issue #1418
2013-10-06 16:02:48 -07:00
Incoming5643
289e801228 adds a null check for wizard.current to avoid runtimes from gibbed wizard 2013-10-06 18:58:38 -04:00
Giacomand
e2c4a14606 Merge pull request #1501 from Ergovisavi/mobsonfire_2
Mobs on Fire - Atmos interaction and Bodytemp Damage tweaks
2013-10-06 15:55:20 -07:00