Commit Graph

3414 Commits

Author SHA1 Message Date
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
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
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
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
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
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
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
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
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
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
Intigracy
3681601b1b There's still discussion to be had before this gets merged. 2013-10-06 16:39:02 -07: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
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
Giacomand
5d490fcdb4 Merge pull request #1498 from Khubajsn/jobOccupationRightClick
Fix for my 'new' job preferences screen
2013-10-06 15:53:40 -07:00
Giacomand
b4b0cfaf54 Merge pull request #1402 from Petethegoat/sayustat
Ported and improved Sayu's awesome alt-click stat panel.
2013-10-06 15:42:49 -07:00
Aranclanos
915663e90c Merge pull request #1407 from Rolan7/Issue1404-PlantBGone
Fixes #1404 by changing how hydro trays can receive reagents.  Pretty much...
2013-10-06 13:53:23 -07:00
Mloc-Argent
79495f710a Refactors the code to work with BYOND 500. Big commit.
Var changes:
* /obj/item/var/color is now item_color
* /obj/machinery/portable_atmospherics/canister/var/color is now canister_color
* /obj/machinery/atmospherics/var/color is now pipe_color
* /mob/living/simple_animal/mouse/var/color is now body_color
* /mob/living/simple_animal/chicken/var/color is now body_color

Proc changes:
* /obj/machinery/door/proc/animate() is now do_animate()
* /obj/machinery/transformer/proc/transform() is now do_transform()

Map changes are due to pipe instances being changed from color to pipe_color

Signed-off-by: Mloc-Argent <colmohici@gmail.com>
2013-10-06 19:47:30 +01:00
Giacomand
3a323c40b1 * Tweaked the brand intelligence event to use the mimic copy class.
* Mimic vending machines will now also talk.
 * Reduced the chance for a vending machine to explode, instead of becoming a mimic.
2013-10-06 17:14:20 +01:00
Giacomand
6ef330ec3e * Made frostoil use SPAWN_COLD when used on a turf. 2013-10-06 00:41:40 +01:00
Giacomand
3b667227e5 * Made atmos_spawn_air() use flags.
* Replaced "fire" with SPAWN_HEAT. You will have to use it in conjunction with SPAWN_TOXINS to spawn fire.
 * Added flags for HEAT, COLD, TOXINS, OXYGEN, CO2, NITROGEN, N2O, FUEL and AIR.
2013-10-06 00:29:45 +01:00
Ergovisavi
06eb96b53c Fixing mobs on fire with luminosity
Admin heal now calls ExtinguishMob() so it updates luminosity properly
Added some lines to simple mobs to stop them from using the on fire system at the moment (Needs sprites!)
2013-10-05 15:06:49 -07:00
Giacomand
f6e62cd830 * Napalm works again, which fixes incendiary grenades.
* Stopped the fuel and n20 option, in spawn_air, from runtiming.
 * Added toxins as a spawn_air option.
 * Removed all use of the fuel option and replaced it with toxins, since fuel does not work with LINDA anymore.
2013-10-05 23:06:24 +01:00
AstralSerpent
5ca72b7a5d Made reagent descriptions nicer (Also I forgot to finish it before! Woops.) 2013-10-06 08:35:34 +11:00
AstralSerpent
6462332591 Added the ..() as lord Giacom requested. Added changes to grinder that giacom did. May as well let them piggyback on this commit and hope it somehow forces my gloriously bads crayon powder to be pulled. 2013-10-06 08:16:17 +11:00
Giacomand
1e49af6cae * Forgot comment. 2013-10-05 22:06:27 +01:00
Giacomand
277fae40cb * Fixed disposal units not starting with full pressure.
* Fixed some disposal units starting unconnected to the trunk, by checking for trunk during initialization.
2013-10-05 22:00:59 +01:00
AstralSerpent
73d4b247a2 Changes some stuff Giacom provided input on. Thanks Aranclanos and Kaze Espada for the help. 2013-10-06 07:21:19 +11:00
Cheridan
e029c078ef Merge pull request #1478 from Miauw62/variousfixes
Various Fixes
2013-10-05 12:04:13 -07:00
Ergovisavi
13d953121d Tweaks for atmos fire and mob interactions
-Hot air is less lethal
-Fire is more lethal
-Catch on fire when entering a hotspot but fire_stacks given dropped to 0.5 each
-You now light up your environment while on fire
2013-10-05 10:40:28 -07:00
AstralSerpent
113d6c0193 Crayons can now be grinded down for coloured crayon powder, which can be used and combined to override reagent colours. 2013-10-05 17:23:17 +10:00
khubajsn
249e77d775 Tweaked the [High] color to more match the original one (because I am too lazy to make it not include the font tag) 2013-10-05 00:12:40 +02:00
khubajsn
44bd0e3186 Removing debug. 2013-10-04 23:47:38 +02:00